Skip to content

Commit d61aed0

Browse files
committed
Merge branch 'jb/doc-packfile-name' into master
Doc update. * jb/doc-packfile-name: pack-write/docs: update regarding pack naming
2 parents 06df6b5 + e2bfa50 commit d61aed0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Documentation/git-index-pack.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ This option cannot be used with --stdin.
104104
NOTES
105105
-----
106106

107-
Once the index has been created, the list of object names is sorted
108-
and the SHA-1 hash of that list is printed to stdout. If --stdin was
107+
Once the index has been created, the hash that goes into the name of
108+
the pack/idx file is printed to stdout. If --stdin was
109109
also used then this is prefixed by either "pack\t", or "keep\t" if a
110110
new .keep file was successfully created. This is useful to remove a
111111
.keep file used as a lock to prevent the race with 'git repack'

pack-write.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ static int need_large_offset(off_t offset, const struct pack_idx_option *opts)
3838
}
3939

4040
/*
41-
* On entry *sha1 contains the pack content SHA1 hash, on exit it is
42-
* the SHA1 hash of sorted object names. The objects array passed in
43-
* will be sorted by SHA1 on exit.
41+
* The *sha1 contains the pack content SHA1 hash.
42+
* The objects array passed in will be sorted by SHA1 on exit.
4443
*/
4544
const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects,
4645
int nr_objects, const struct pack_idx_option *opts,

0 commit comments

Comments
 (0)