From: Phillip Wood <phillip.wood@talktalk.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] revert & cherry-pick: run git gc --auto
Date: Thu, 11 Oct 2018 10:23:11 +0100 [thread overview]
Message-ID: <20f33df8-7ba8-af26-e0c8-16152345c85b@talktalk.net> (raw)
In-Reply-To: <20181010193557.19052-1-avarab@gmail.com>
Hi Ævar
On 10/10/2018 20:35, Ævar Arnfjörð Bjarmason wrote:
> 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.
If cherry-pick, revert or 'rebase -i' edit the commit message then they
fork 'git commit' so gc --auto will be run there anyway. I wonder if it
would be better to call 'gc --auto' from sequencer.c at the end of a
string of successful picks, that would cover cherry-pick, 'rebase -iu'
and revert. With 'rebase -i' it might be nice to avoid calling 'gc
--auto' until the very end, rather than every time we stop for an edit
but that is probably more trouble than it is worth.
Best Wishes
Phillip
>
> 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;
> }
>
next prev parent reply other threads:[~2018-10-11 9:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 19:35 [PATCH] revert & cherry-pick: run git gc --auto Ævar Arnfjörð Bjarmason
2018-10-11 9:23 ` Phillip Wood [this message]
2018-10-11 10:08 ` Ævar Arnfjörð Bjarmason
2018-10-11 10:25 ` SZEDER Gábor
2018-10-11 10:34 ` Ævar Arnfjörð Bjarmason
2018-10-11 11:24 ` SZEDER Gábor
2018-10-11 11:14 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20f33df8-7ba8-af26-e0c8-16152345c85b@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).