From: ZheNing Hu <adlternative@gmail.com>
To: phillip.wood@dunelm.org.uk
Cc: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>,
"Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Hariom Verma" <hariom18599@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Han-Wen Nienhuys" <hanwen@google.com>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: Re: [PATCH 1/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
Date: Mon, 2 Aug 2021 21:34:46 +0800 [thread overview]
Message-ID: <CAOLTT8S=v41p_uZQ4u0LBnHkRp3pMpVK0Pt5mykzbfX9ReTC7g@mail.gmail.com> (raw)
In-Reply-To: <273d1864-422e-f31f-13ef-20cfe4871947@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> 于2021年8月1日周日 下午6:10写道:
>
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index 12f093121d9..5983f37d531 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
> > @@ -84,6 +84,7 @@ struct rebase_options {
> > REBASE_FORCE = 1<<3,
> > REBASE_INTERACTIVE_EXPLICIT = 1<<4,
> > } flags;
> > + int delete_cherry_pick_head;
> > struct strvec git_am_opts;
> > const char *action;
> > int signoff;
> > @@ -152,6 +153,7 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
> > oidcpy(&replay.squash_onto, opts->squash_onto);
> > replay.have_squash_onto = 1;
> > }
> > + replay.delete_cherry_pick_head = opts->delete_cherry_pick_head;
>
> I think we could just have
> replay.delete_cherry_pick_head = 1;
> and not add a new member to rebase_options as we always want this set
Maybe you are right.
> > -static void print_advice(struct repository *r, int show_hint,
> > - struct replay_opts *opts)
> > +static void print_advice(struct replay_opts *opts, int show_hint)
> > {
> > char *msg = getenv("GIT_CHERRY_PICK_HELP");
> >
> > if (msg) {
> > - fprintf(stderr, "%s\n", msg);
> > - /*
> > - * A conflict has occurred but the porcelain
> > - * (typically rebase --interactive) wants to take care
> > - * of the commit itself so remove CHERRY_PICK_HEAD
> > - */
> > - refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
> > - NULL, 0);
> > - return;
> > - }
> > -
> > - if (show_hint) {
> > + advise("%s\n", msg);
>
> This is a change in behavior as the advice will now be prefixed with
> "hint: ". I think that is probably an improvement so long as it does not
> make the lines too long when the advice is printed.
>
Yeah, maybe I should mention this in commit messages.
>
> I think it would be useful to add a test for the new cherry-pick option
> that is added in this patch. Overall this patch is looking pretty good
> it just needs a few small changes, thanks for working on it.
>
Make sence.
> Best Wishes
>
> Phillip
Thanks.
--
ZheNing Hu
next prev parent reply other threads:[~2021-08-02 13:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 7:01 [PATCH 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-07-31 7:01 ` [PATCH 1/2] " ZheNing Hu via GitGitGadget
2021-08-01 10:09 ` Phillip Wood
2021-08-02 13:34 ` ZheNing Hu [this message]
2021-07-31 7:01 ` [PATCH 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget
2021-08-01 10:14 ` Phillip Wood
2021-08-02 13:35 ` ZheNing Hu
2021-08-03 1:16 ` [PATCH v2 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-08-03 1:16 ` [PATCH v2 1/2] " ZheNing Hu via GitGitGadget
2021-08-03 22:36 ` Junio C Hamano
2021-08-04 8:35 ` ZheNing Hu
2021-08-04 10:10 ` Phillip Wood
2021-08-04 17:31 ` Junio C Hamano
2021-08-05 5:36 ` ZheNing Hu
2021-08-03 1:16 ` [PATCH v2 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget
2021-08-05 5:48 ` [PATCH v3] " ZheNing Hu via GitGitGadget
2021-08-11 10:00 ` Phillip Wood
2021-08-13 8:08 ` ZheNing Hu
2021-08-13 20:14 ` Junio C Hamano
2021-08-14 2:07 ` ZheNing Hu
2021-08-17 10:09 ` Phillip Wood
2021-08-14 10:27 ` [PATCH v4] " ZheNing Hu via GitGitGadget
2021-08-14 20:32 ` Junio C Hamano
2021-08-15 12:48 ` ZheNing Hu
2021-08-16 0:55 ` [PATCH v5] " ZheNing Hu via GitGitGadget
2021-08-18 9:51 ` Phillip Wood
2021-08-19 1:55 ` ZheNing Hu
2021-08-19 2:07 ` ZheNing Hu
2021-08-19 5:51 ` [PATCH v6] " ZheNing Hu via GitGitGadget
2021-08-19 17:10 ` Junio C Hamano
2021-08-21 1:40 ` ZheNing Hu
2021-08-22 13:08 ` [PATCH v7] " ZheNing Hu via GitGitGadget
-- strict thread matches above, loose matches on Subject: below --
2021-07-29 12:27 [PATCH 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-07-29 12:27 ` [PATCH 1/2] " ZheNing Hu via GitGitGadget
2021-07-29 20:56 ` Junio C Hamano
2021-07-30 14:15 ` ZheNing Hu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOLTT8S=v41p_uZQ4u0LBnHkRp3pMpVK0Pt5mykzbfX9ReTC7g@mail.gmail.com' \
--to=adlternative@gmail.com \
--cc=artagnon@gmail.com \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=hanwen@google.com \
--cc=hariom18599@gmail.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.
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 NNTP newsgroup(s).