builtin/repack.c: reword comment around pack-objects flags
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>
Junio C Hamano committed
Mar 5, 2021 at 10:22 UTC
ccae01cab817f64a52fcb403cb355e41c2303b74
1 file changed
+7
-5
builtin/repack.c
+7
-5
@@ -545,12 +545,14 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
545
strvec_push(&cmd.args, "--non-empty");
546
if (!geometry) {
547
/*
548
- * 'git pack-objects' will up all objects loose or packed
549
- * (either rolling them up or leaving them alone), so don't pass
550
- * these options.
548
+ * We need to grab all reachable objects, including those that
549
+ * are reachable from reflogs and the index.
550
*
552
- * The implementation of 'git pack-objects --stdin-packs'
553
- * makes them redundant (and the two are incompatible).
551
+ * When repacking into a geometric progression of packs,
552
+ * however, we ask 'git pack-objects --stdin-packs', and it is
553
+ * not about packing objects based on reachability but about
554
+ * repacking all the objects in specified packs and loose ones
555
+ * (indeed, --stdin-packs is incompatible with these options).
556
*/
557
strvec_push(&cmd.args, "--all");
558
strvec_push(&cmd.args, "--reflog");