From patchwork Thu Sep 27 19:12:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10618479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CDD0D180E for ; Thu, 27 Sep 2018 19:12:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC0992B638 for ; Thu, 27 Sep 2018 19:12:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B08FC2BA65; Thu, 27 Sep 2018 19:12:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 568052BA97 for ; Thu, 27 Sep 2018 19:12:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728716AbeI1Bc2 (ORCPT ); Thu, 27 Sep 2018 21:32:28 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:43134 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728500AbeI1Bc1 (ORCPT ); Thu, 27 Sep 2018 21:32:27 -0400 Received: by mail-lf1-f66.google.com with SMTP id x24-v6so3047720lfe.10 for ; Thu, 27 Sep 2018 12:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AUrE/mMMyuFxYmZFu42KeQqVpzwkfCag2MqlTiQzdnw=; b=YNOcobRi4ZNND4Y+yEEpbDpbIV8SrWKACiDgaMn1tS4xuRU/kP0ORYfgDsGxMn3DrX cojk5VrYS4opMwaRGV25y3vi1nUEdtVwi7mf43pYWItoCmUbcLfCWz90N5roHimWzNKM geZf7d8PZvO4M5PMTwNOxp5rST8sQojo3Wjwf43fCQ2nthhXTnSdkl6UU1nc8KuLq21D HWZAuJC1N8/dVBPEmJWy/taRb0BrqMkP4U1GQV8WTNglwVvqzGj6C7nytVcOspxf1TQj t2pVoKL/yEQWUbzOgBHthAZo2qMUbzJ1D5Nk2oGsqrIk0vlk7cg0l8wtojgkXuuq5wol V9cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AUrE/mMMyuFxYmZFu42KeQqVpzwkfCag2MqlTiQzdnw=; b=HeUGVTYiQI7AMMaPmElzEMaZYCIIWBGbrPJh3xu3/dCvovPNojiCc+8wDK9H4+FaaU BgyIgAoBK1hGTF6ksYCIk5DEZh+VXDVP9pnAPAlEkzvROHIvS99eD7nRi2VO34E85KDD 0GMQrSggO1Xk5sVwZsXh+8Dl9CrEG9Izrquq5vgJiKOMVbl+6SG2FyvQSMa6rbCv0z7N HYlzEdXSRJJDvw05Dq4053rjsEICwd7ea8R9oavdcFpVJb5TfQ46gzOf3kUZCQd54byL 10Rh3Nz1bbrKl5Xc55+Dk1W6Tc466QFhMYYHeUW9BnYG7AUK2ilxCiQhkCgdRotZyGyH J24Q== X-Gm-Message-State: ABuFfog8958I+MCThBZhLKUgUYGk5zuHvsNj4vgRxitD1BVLqxmEsy79 d4xCcj2Cs1UENc2fqT23Qhiphm46 X-Google-Smtp-Source: ACcGV617aXUm1UrqvbOBh8VJDMh5O6XdHn98YvLrqJ99lem+uJqIlWbFsorEWwmbsubSOz9b3rW1wA== X-Received: by 2002:a19:2288:: with SMTP id i130-v6mr5178095lfi.50.1538075560394; Thu, 27 Sep 2018 12:12:40 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id r79-v6sm561673ljb.84.2018.09.27.12.12.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Sep 2018 12:12:39 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Derrick Stolee Subject: [PATCH v2 1/4] git-commit-graph.txt: fix bullet lists Date: Thu, 27 Sep 2018 21:12:19 +0200 Message-Id: <837ef2f231b078cbb0eff3b33917fcc38626d788.1538075326.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.19.0.216.g2d3b1c576c In-Reply-To: References: <6b1cb43e-a1a8-921f-cd66-3697609854e0@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have a couple of bullet items which span multiple lines, and where we have prefixed each line with a `*`. (This might be the result of a text editor trying to help.) This results in each line being typeset as a separate bullet item. Drop the extra `*`. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index dececb79d7..f42f2a1481 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -73,7 +73,7 @@ $ git commit-graph write ------------------------------------------------ * Write a graph file, extending the current graph file using commits -* in . + in . + ------------------------------------------------ $ echo | git commit-graph write --stdin-packs @@ -86,7 +86,7 @@ $ git show-ref -s | git commit-graph write --stdin-commits ------------------------------------------------ * Write a graph file containing all commits in the current -* commit-graph file along with those reachable from HEAD. + commit-graph file along with those reachable from HEAD. + ------------------------------------------------ $ git rev-parse HEAD | git commit-graph write --stdin-commits --append From patchwork Thu Sep 27 19:12:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10618485 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 843EF174A for ; Thu, 27 Sep 2018 19:12:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 727DA2B638 for ; Thu, 27 Sep 2018 19:12:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6708B2BA70; Thu, 27 Sep 2018 19:12:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 128F02B638 for ; Thu, 27 Sep 2018 19:12:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728724AbeI1Bcb (ORCPT ); Thu, 27 Sep 2018 21:32:31 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:46754 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728401AbeI1Bc3 (ORCPT ); Thu, 27 Sep 2018 21:32:29 -0400 Received: by mail-lj1-f194.google.com with SMTP id 203-v6so3456214ljj.13 for ; Thu, 27 Sep 2018 12:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PM8NodNoCMgmmCjvNiZ+IdLKLyYyayNmC1YFlDwuJlM=; b=PdJ/L702XsBUmmlgp8yPOQPyF/js6ZHb3b8cMLE3Cv0y5e/zZdrSykmeavFaUXYwPl Ebed6AcXj40BcfIYuWRLZOXU5MqFumIyDaZZZJIMVNIWv9kIXVt9e3bDpdysOviopQUx ER3kmg9h4DTJAjQq70V8PpFVbpKTJO/GzcX0RLxLXnXDvieotVYRg8GA8sEnZFxgGAmu v+M22UHg3ixpHn/xUercBgm+kdJUCvjgQ95XZ7VoV4JAzdbt4Ukl8+s8oWkdFbFpCr1j jsJ1KdFHF5rGnbaJd1CWPXuLpF8AETzLnf3Rp90I/CRUinPL2mqQNS++o+04hrPeuU+u W8jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PM8NodNoCMgmmCjvNiZ+IdLKLyYyayNmC1YFlDwuJlM=; b=LW4WKqe9TBsyq9kpyTO8wOmwTNXHm6l4kMoVj/ReK30fTu+FWn344hDV1q6RB1XWg3 3Uj0SY0KYh1a9MPdP3AMq3UZKLXh9GYbxGSn5xm+9RQ0OgcfiVgFp2pN5iLV3x/epO/s eegaC093JcGYo9T3jZjxGcXf70cgC1yueyWGKndLbVxKfNN7BqE9mtO+K9J4kUmf5ziL lbYTZmHBGptRowEJQyrAv+nAJwu7guKDbkCJxev2599ZGVBu0vW2/0Uk7dMn9FteGmXg OkDVMYCssfcwq4Mu7WstStvSee3xAzg/Fj5N6IiAXX5vyC3CJsbySVa4WvUoBaJplRiU JdqQ== X-Gm-Message-State: ABuFfoihNCff0WBNEt3dfAHhl7gVynsA/DH8AnaYKL1BHHAtxd6A+B3z 0YJ+DhbjIL4UWqcUoTcO8OPRgXoh X-Google-Smtp-Source: ACcGV63adyF5UAzWI3pamtsbMcLD0rXPkIB+NdOgvHfBeZ8lljT9tQCEgfZ5rJNyKWJ9ekjSYXCYcA== X-Received: by 2002:a2e:44d0:: with SMTP id b77-v6mr6741246ljf.47.1538075562358; Thu, 27 Sep 2018 12:12:42 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id r79-v6sm561673ljb.84.2018.09.27.12.12.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Sep 2018 12:12:41 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Derrick Stolee Subject: [PATCH v2 2/4] git-commit-graph.txt: typeset more in monospace Date: Thu, 27 Sep 2018 21:12:20 +0200 Message-Id: <9759a162ca95c3ff9478f0947da3bed9e0493dac.1538075326.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.19.0.216.g2d3b1c576c In-Reply-To: References: <6b1cb43e-a1a8-921f-cd66-3697609854e0@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While we're here, fix an instance of "folder" to be "directory". Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index f42f2a1481..6ac610f016 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -25,9 +25,9 @@ OPTIONS --object-dir:: Use given directory for the location of packfiles and commit graph file. This parameter exists to specify the location of an alternate - that only has the objects directory, not a full .git directory. The - commit graph file is expected to be at /info/commit-graph and - the packfiles are expected to be in /pack. + that only has the objects directory, not a full `.git` directory. The + commit graph file is expected to be at `/info/commit-graph` and + the packfiles are expected to be in `/pack`. COMMANDS @@ -66,14 +66,15 @@ database. Used to check for corrupted data. EXAMPLES -------- -* Write a commit graph file for the packed commits in your local .git folder. +* Write a commit graph file for the packed commits in your local `.git` + directory. + ------------------------------------------------ $ git commit-graph write ------------------------------------------------ * Write a graph file, extending the current graph file using commits - in . + in ``. + ------------------------------------------------ $ echo | git commit-graph write --stdin-packs @@ -86,7 +87,7 @@ $ git show-ref -s | git commit-graph write --stdin-commits ------------------------------------------------ * Write a graph file containing all commits in the current - commit-graph file along with those reachable from HEAD. + commit-graph file along with those reachable from `HEAD`. + ------------------------------------------------ $ git rev-parse HEAD | git commit-graph write --stdin-commits --append From patchwork Thu Sep 27 19:12:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10618483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1B15174A for ; Thu, 27 Sep 2018 19:12:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F91B2B638 for ; Thu, 27 Sep 2018 19:12:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8413F2BA70; Thu, 27 Sep 2018 19:12:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23C662B638 for ; Thu, 27 Sep 2018 19:12:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728729AbeI1Bcb (ORCPT ); Thu, 27 Sep 2018 21:32:31 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:33351 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728500AbeI1Bca (ORCPT ); Thu, 27 Sep 2018 21:32:30 -0400 Received: by mail-lj1-f195.google.com with SMTP id l19-v6so3541664ljb.0 for ; Thu, 27 Sep 2018 12:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BYp368BDaaopBicc4/f1CJmNtkArAaZnpIlapJUV+7o=; b=hcKXkn6nGu7PP52zGkKu1DST4W2H57ebsf2Fwjh43JrPWnLlqmWYzXYR8wDhJkIN6h T4inNOfnquyMSWroCoPkaW6CzvK7US65sBrWjssvJgP+eIl9PEHu6Kra+H2dcpfPy3Ba 22l4faLzMhjyrEivWZOt95ttYe95DFUVHX/yUzqXMDrmP29RI180TuokSFBbC4cxVoss zOcpcrzX5cRMk+uk/Br6uQiv6likGuBlR0OTAgcbuvMIvq25o4rpnuNBQOHbyHdBJLKJ QrddxcG8Sch6/K14g66TvAa7EBS2NOBYydXsd0wl2B1PdBDHYOz1941umfdcgtDWNPHx k80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BYp368BDaaopBicc4/f1CJmNtkArAaZnpIlapJUV+7o=; b=tXC3DSKilDCmpZRGkNwXQJs1NjWHlrl8FsZLaPIY6U/YyuyOCzDYaSvdZ6V5VGe8Fp EamKhADcj7cTuNqVISmUdkWT5s8hguBgG4XHvTC+sciyNmQazdFqIqfsq80BToIrKOCx wCa3VKh6/Q+RkT4J6KJggcPblXXVu/iK8Nbi7eNnj2/Q5U8KVbkuugB2lCRp5Uay4OEU pKWbHSEi12j4met331Tt+9j8Zx5/HR8BHrGlV7nZogrvKknln7iFBQ7d6u0XAX+e+XWx AToJqb7I10BqtGyQ1wuENinUSe2UyPD3lF0wwvyjF9ofHtMK4XlHQ5pcU0ahFbdLclW/ E6BA== X-Gm-Message-State: ABuFfoilmMTithj71KlvG/KMhNNwXKo7ZcRc5AJ/Ig0atu7BuuXSFcrK nbNakfFYLFgYX25dkaDzl/pebtVv X-Google-Smtp-Source: ACcGV62uEO8/J8npep1W2LqSg73fow9oG7Z1gmY+iZOkGXMfCYEcsRzgwIN1h9Whn1qChe1kHFFR/A== X-Received: by 2002:a2e:5215:: with SMTP id g21-v6mr6586878ljb.144.1538075564177; Thu, 27 Sep 2018 12:12:44 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id r79-v6sm561673ljb.84.2018.09.27.12.12.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Sep 2018 12:12:43 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Derrick Stolee Subject: [PATCH v2 3/4] git-commit-graph.txt: refer to "*commit*-graph file" Date: Thu, 27 Sep 2018 21:12:21 +0200 Message-Id: <759bc886d84e3b38d48e3fce7956a517f9055462.1538075326.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.19.0.216.g2d3b1c576c In-Reply-To: References: <6b1cb43e-a1a8-921f-cd66-3697609854e0@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This document sometimes refers to the "commit-graph file" as just "the graph file". This saves a couple of words here and there at the risk of confusion. In particular, the documentation for `git commit-graph read` appears to suggest that there are indeed different types of graph files. Let's just write out the full name everywhere. The full name, by the way, is not the dash-less "commit graph file". Use the dashed form. (The next commit will fix the remaining few instances of the "commit graph file" in this document.) Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index 6ac610f016..f33330a171 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -54,8 +54,8 @@ existing commit-graph file. 'read':: -Read a graph file given by the commit-graph file and output basic -details about the graph file. Used for debugging purposes. +Read the commit-graph file and output basic details about it. +Used for debugging purposes. 'verify':: @@ -73,20 +73,20 @@ EXAMPLES $ git commit-graph write ------------------------------------------------ -* Write a graph file, extending the current graph file using commits - in ``. +* Write a commit-graph file, extending the current commit-graph file + using commits in ``. + ------------------------------------------------ $ echo | git commit-graph write --stdin-packs ------------------------------------------------ -* Write a graph file containing all reachable commits. +* Write a commit-graph file containing all reachable commits. + ------------------------------------------------ $ git show-ref -s | git commit-graph write --stdin-commits ------------------------------------------------ -* Write a graph file containing all commits in the current +* Write a commit-graph file containing all commits in the current commit-graph file along with those reachable from `HEAD`. + ------------------------------------------------ From patchwork Thu Sep 27 19:12:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 10618487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3818112B for ; Thu, 27 Sep 2018 19:12:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEB0F2B638 for ; Thu, 27 Sep 2018 19:12:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1E052BA70; Thu, 27 Sep 2018 19:12:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E3A62B638 for ; Thu, 27 Sep 2018 19:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728733AbeI1Bce (ORCPT ); Thu, 27 Sep 2018 21:32:34 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36620 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728500AbeI1Bce (ORCPT ); Thu, 27 Sep 2018 21:32:34 -0400 Received: by mail-lj1-f193.google.com with SMTP id p89-v6so3518607ljb.3 for ; Thu, 27 Sep 2018 12:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7Xva8vQDZEMUAE1Q6f9lSk4IcxNRk30fbL+PPGRBeEk=; b=KHL1GmtKO907sM0XeXCmwpBSLIo/OVK/QtLrLjsrhj/2tIqHU3Cfb3XebwziHaRkvu EyzXycK/aLlgZWcSqUlvSBEPu6e9nVeZdh+JZOt8hEDO65rRNkta64q7udTky+7FEtbX npua7lmTsJZe/EYWGsbgW2xVPMIFzIrgzYE284uFWJQTKIyp4XQQLLOPFDPayjAAQafN cfdIUUmK1gD4JFeiATJIaNXBxAlVf5epYVV1ywy6luP1Rx1NAJktVUt9Ub2As0WpBMSR YUgQxina4eJ01zJsWKCiad5dKZrPZRFX7st7wYiZo9o5dWzFOFHMg2mjpDiGJZM08rKv snvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7Xva8vQDZEMUAE1Q6f9lSk4IcxNRk30fbL+PPGRBeEk=; b=NxwFXVp1Fiulg27Sha48oHSkl/GaFt05hbjTuXn+IZdBj7zOHbaLqiyrrMJpkJuOTZ Z7DDBr4TnLQEtJnQMXHaffTXcsjUAzOcck1FxXtLE89VeXSyrfgXbWCW60kBI3N3B4aX iFMsntGECyJwJqY8aaf5zTsKT2welFqHO2ebyKh/JcFgbIlfS9dOblamq1qXVok5frjh zxp6lDxQ2+NGlIo2kMM8O6yPlYUYEMaU8wCjYSqqnbbWCnuRT0TTCtxnb5WUq+3AJSYg 3VqR+O9Qkdse3UIjPZXC/7Nvszgeb3xP1qmzcgkC4cWOHuyciTTo6/nhwhCTFkqS1dNg O5mQ== X-Gm-Message-State: ABuFfojQtk1NlPVCx6uf1/qr2wKUjIMt3qLcamU9ZL+xxjfbv90tTMaV fPG6GDAx83svEIQcpC9/mdAMk/+5 X-Google-Smtp-Source: ACcGV60XgoXfYBAQM2l+HzvWIM+bNZVm4gMg1qw7g4rJ77vewig4jGWIOcUM2qHRTmpM3CwQ2OVqHw== X-Received: by 2002:a2e:8346:: with SMTP id l6-v6mr7450827ljh.72.1538075566016; Thu, 27 Sep 2018 12:12:46 -0700 (PDT) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id r79-v6sm561673ljb.84.2018.09.27.12.12.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Sep 2018 12:12:45 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Derrick Stolee Subject: [PATCH v2 4/4] Doc: refer to the "commit-graph file" with dash Date: Thu, 27 Sep 2018 21:12:22 +0200 Message-Id: <99b64287ec22e8690d5518002240be3e9147cb8e.1538075326.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.19.0.216.g2d3b1c576c In-Reply-To: References: <6b1cb43e-a1a8-921f-cd66-3697609854e0@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The file processed by `git commit-graph` is referred to as the "commit-graph file", also with a dash. We have a few references to the "commit graph file", though, without the dash. These occur in git-commit-graph.txt as well as in Doc/technical/commit-graph.txt. Fix them. Do not change the references to the "commit graph" (without "... file") as a data structure. Signed-off-by: Martin Ågren --- Documentation/git-commit-graph.txt | 12 ++++++------ Documentation/technical/commit-graph.txt | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index f33330a171..624470e198 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -3,7 +3,7 @@ git-commit-graph(1) NAME ---- -git-commit-graph - Write and verify Git commit graph files +git-commit-graph - Write and verify Git commit-graph files SYNOPSIS @@ -17,16 +17,16 @@ SYNOPSIS DESCRIPTION ----------- -Manage the serialized commit graph file. +Manage the serialized commit-graph file. OPTIONS ------- --object-dir:: - Use given directory for the location of packfiles and commit graph + Use given directory for the location of packfiles and commit-graph file. This parameter exists to specify the location of an alternate that only has the objects directory, not a full `.git` directory. The - commit graph file is expected to be at `/info/commit-graph` and + commit-graph file is expected to be at `/info/commit-graph` and the packfiles are expected to be in `/pack`. @@ -34,7 +34,7 @@ COMMANDS -------- 'write':: -Write a commit graph file based on the commits found in packfiles. +Write a commit-graph file based on the commits found in packfiles. + With the `--stdin-packs` option, generate the new commit graph by walking objects only in the specified pack-indexes. (Cannot be combined @@ -66,7 +66,7 @@ database. Used to check for corrupted data. EXAMPLES -------- -* Write a commit graph file for the packed commits in your local `.git` +* Write a commit-graph file for the packed commits in your local `.git` directory. + ------------------------------------------------ diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt index c664acbd76..6b7dde011e 100644 --- a/Documentation/technical/commit-graph.txt +++ b/Documentation/technical/commit-graph.txt @@ -15,13 +15,13 @@ There are two main costs here: 1. Decompressing and parsing commits. 2. Walking the entire graph to satisfy topological order constraints. -The commit graph file is a supplemental data structure that accelerates +The commit-graph file is a supplemental data structure that accelerates commit graph walks. If a user downgrades or disables the 'core.commitGraph' config setting, then the existing ODB is sufficient. The file is stored as "commit-graph" either in the .git/objects/info directory or in the info directory of an alternate. -The commit graph file stores the commit graph structure along with some +The commit-graph file stores the commit graph structure along with some extra metadata to speed up graph walks. By listing commit OIDs in lexi- cographic order, we can identify an integer position for each commit and refer to the parents of a commit using those integer positions. We use @@ -103,7 +103,7 @@ that of a parent. Design Details -------------- -- The commit graph file is stored in a file named 'commit-graph' in the +- The commit-graph file is stored in a file named 'commit-graph' in the .git/objects/info directory. This could be stored in the info directory of an alternate. @@ -127,7 +127,7 @@ Future Work - 'log --topo-order' - 'tag --merged' -- A server could provide a commit graph file as part of the network protocol +- A server could provide a commit-graph file as part of the network protocol to avoid extra calculations by clients. This feature is only of benefit if the user is willing to trust the file, because verifying the file is correct is as hard as computing it from scratch.