[PATCH] revert & cherry-pick: run git gc --auto
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Oct 10, 2018, 19:35 UTC
- Message-ID
- <20181010193557.19052-1-avarab@gmail.com>
Expand on the work started in 095c741edd ("commit: run git gc --auto just before the post-commit hook", 2018-02-28) to run "gc --auto" in more commands where new objects can be created.
The notably missing commands are now "rebase" and "stash". Both are being rewritten in C, so any use of "gc --auto" there can wait for that.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> ---
After reading the "Users are encouraged to run this task..." paragraph in the git-gc manpage I was wondering if due to gc --auto all over the place now (including recently in git-commit with a patch of mine) if we shouldn't change that advice.
I'm meaning to send some doc changes to git-gc.txt, but in the meantime let's address this low-hanging fruit of running gc --auto when we revert or cherry-pick commits, which can like git-commit create a significant amount of loose objects.
builtin/revert.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/builtin/revert.c b/builtin/revert.c index 9a66720cfc..1b20902910 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -209,6 +209,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix) { struct replay_opts opts = REPLAY_OPTS_INIT; int res; + const char *argv_gc_auto[] = {"gc", "--auto", NULL}; if (isatty(0)) opts.edit = 1; @@ -217,6 +218,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix) res = run_sequencer(argc, argv, &opts); if (res < 0) die(_("revert failed")); + run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); return res; } @@ -224,11 +226,13 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) { struct replay_opts opts = REPLAY_OPTS_INIT; int res; + const char *argv_gc_auto[] = {"gc", "--auto", NULL}; opts.action = REPLAY_PICK; sequencer_init_config(&opts); res = run_sequencer(argc, argv, &opts); if (res < 0) die(_("cherry-pick failed")); + run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); return res; }
-- 2.19.1.390.gf3a00b506f