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

builtin/repack.c: reword comment around pack-objects flags

Browse Source 
The comment in this block is meant to indicate that passing '--all',
'--reflog', and so on aren't necessary when repacking with the
'--geometric' option.

But, it has two problems: first, it is factually incorrect ('--all' is
*not* incompatible with '--stdin-packs' as the comment suggests);
second, it is quite focused on the geometric case for a block that is
guarding against it.

Reword this comment to address both issues.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2021-03-05 10:22:02 -05:00
parent 2a15964128
commit ccae01cab8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/repack.c
View File

@ -545,12 +545,14 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
strvec_push(&cmd.args, "--non-empty"); strvec_push(&cmd.args, "--non-empty");
if (!geometry) { if (!geometry) {
/* /*
* 'git pack-objects' will up all objects loose or packed * We need to grab all reachable objects, including those that
* (either rolling them up or leaving them alone), so don't pass * are reachable from reflogs and the index.
* these options.
* *
* The implementation of 'git pack-objects --stdin-packs' * When repacking into a geometric progression of packs,
* makes them redundant (and the two are incompatible). * however, we ask 'git pack-objects --stdin-packs', and it is
* not about packing objects based on reachability but about
* repacking all the objects in specified packs and loose ones
* (indeed, --stdin-packs is incompatible with these options).
*/ */
strvec_push(&cmd.args, "--all"); strvec_push(&cmd.args, "--all");
strvec_push(&cmd.args, "--reflog"); strvec_push(&cmd.args, "--reflog");