On Sat, Mar 24 2018, Nguyễn Thái Ngọc Duy wrote:
> struct option builtin_gc_options[] = {
> OPT__QUIET(&quiet, N_("suppress progress reporting")),
> @@ -362,6 +390,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
> OPT_BOOL(0, "aggressive", &aggressive, N_("be more thorough (increased runtime)")),
> OPT_BOOL(0, "auto", &auto_gc, N_("enable auto-gc mode")),
> OPT_BOOL(0, "force", &force, N_("force running gc even if there may be another gc running")),
> + OPT_BOOL(0, "keep-largest-pack", &keep_base_pack,
> + N_("repack all other packs except the largest pack")),
> OPT_END()
> };
This conflicts with master because of your own 7e1eeaa431 ("completion:
use __gitcomp_builtin in _git_gc", 2018-02-09). I pushed out a
avar-pclouds/gc-auto-keep-base-pack branch to github.com/avar/git which
resolves it as:
@@ -365,6 +393,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
OPT_BOOL_F(0, "force", &force,
N_("force running gc even if there may be another gc running"),
PARSE_OPT_NOCOMPLETE),
+ OPT_BOOL(0, "keep-largest-pack", &keep_base_pack,
+ N_("repack all other packs except the largest pack")),
OPT_END()
};
I assume that's the intention here.
