undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jb/doc-packfile-name' into master

Browse Source 
Doc update.

* jb/doc-packfile-name:
  pack-write/docs: update regarding pack naming
This commit is contained in:
Junio C Hamano 2020-07-30 21:34:32 -07:00
commit d61aed07bd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-index-pack.txt
View File

@ -104,8 +104,8 @@ This option cannot be used with --stdin.
NOTES NOTES
----- -----
Once the index has been created, the list of object names is sorted Once the index has been created, the hash that goes into the name of
and the SHA-1 hash of that list is printed to stdout. If --stdin was 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 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 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' .keep file used as a lock to prevent the race with 'git repack'

5
pack-write.c
View File

@ -38,9 +38,8 @@ static int need_large_offset(off_t offset, const struct pack_idx_option *opts)
} }
/* /*
* On entry *sha1 contains the pack content SHA1 hash, on exit it is * The *sha1 contains the pack content SHA1 hash.
* the SHA1 hash of sorted object names. The objects array passed in * The objects array passed in will be sorted by SHA1 on exit.
* will be sorted by SHA1 on exit.
*/ */
const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects,
int nr_objects, const struct pack_idx_option *opts, int nr_objects, const struct pack_idx_option *opts,