diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2020-07-22 23:40:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-22 15:38:22 -0700 |
| commit | e2bfa50ac3bfc697f3caa623213acbf591cdfa8e (patch) | |
| tree | 234558ce867aff17c69ea8d5bb24aee2255cbee7 /Documentation/git-index-pack.txt | |
| parent | 1190a1acf800acdcfd7569f87ac1560e2d077414 (diff) | |
| download | git-e2bfa50ac3bfc697f3caa623213acbf591cdfa8e.tar.gz | |
pack-write/docs: update regarding pack naming
The index-pack documentation explicitly states that the pack
name is derived from the sorted list of object names, but
since commit 1190a1acf800 ("pack-objects: name pack files
after trailer hash") that isn't true anymore.
Be less explicit in the docs as to what the exact output is,
and just say that it's whatever goes into the pack name.
Also update a comment on write_idx_file() since it no longer
modifies the sha1 variable (it's const now anyway), as noted
by Junio.
Fixes: 1190a1acf800 ("pack-objects: name pack files after trailer hash")
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-index-pack.txt')
| -rw-r--r-- | Documentation/git-index-pack.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt index 7a4e055520..b89a5517e5 100644 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.txt @@ -91,8 +91,8 @@ OPTIONS Note ---- -Once the index has been created, the list of object names is sorted -and the SHA-1 hash of that list is printed to stdout. If --stdin was +Once the index has been created, the hash that goes into the name of +the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a .keep file used as a lock to prevent the race with 'git repack' |