From: Junio C Hamano <gitster@pobox.com>
To: ZheNing Hu <adlternative@gmail.com>
Cc: "Phillip Wood" <phillip.wood123@gmail.com>,
"ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>,
"Git List" <git@vger.kernel.org>,
"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 v2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
Date: Wed, 28 Jul 2021 10:24:12 -0700 [thread overview]
Message-ID: <xmqqr1fi9wsj.fsf@gitster.g> (raw)
In-Reply-To: <CAOLTT8RRbwss5sJAM-a=LQrZjr0fyOP4C_x8oRGdLFFnpc+M3g@mail.gmail.com> (ZheNing Hu's message of "Wed, 28 Jul 2021 18:56:02 +0800")
ZheNing Hu <adlternative@gmail.com> writes:
> I think this function "check_need_delete_cherry_pick_head()" should be before
> print_advice(), like this:
>
> + const char *help_msgs = NULL;
> +
> error(command == TODO_REVERT
> ? _("could not revert %s... %s")
> : _("could not apply %s... %s"),
> short_commit_name(commit), msg.subject);
> - print_advice(r, res == 1, opts);
> + if (((opts->action == REPLAY_PICK &&
> + !opts->rebase_preserve_merges_mode) ||
> + (help_msgs = check_need_delete_cherry_pick_head(r))) &&
> + res == 1)
> + print_advice(opts, help_msgs);
Sorry, but I am not sure what problem this separation is trying to
solve.
The root cause of the issue we have, I think, is because the
decision to delete or keep the cherry-pick-head pseudoref is tied to
what message we give to users in the current code, and the suggested
split of concern is to limit print_advice() to only print the advice
message, and a new helper to decide and remove the pseudoref,
without relying on what is in the GIT_CHERRY_PICK_HELP environment.
It is unclear where you are making the decision to keep or remove
the pseudoref in the above arrangement that lets the new
check_need_delete_cherry_pick_head() decide if the advice is printed
or not.
next prev parent reply other threads:[~2021-07-28 17:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 14:06 [PATCH] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-07-22 21:25 ` Junio C Hamano
2021-07-23 9:37 ` ZheNing Hu
2021-07-23 17:01 ` Felipe Contreras
2021-07-24 14:01 ` [PATCH v2] " ZheNing Hu via GitGitGadget
2021-07-27 19:43 ` Phillip Wood
2021-07-27 20:44 ` Junio C Hamano
2021-07-27 21:00 ` Junio C Hamano
2021-07-28 9:56 ` Phillip Wood
2021-07-28 10:56 ` ZheNing Hu
2021-07-28 17:24 ` Junio C Hamano [this message]
2021-07-28 11:34 ` ZheNing Hu
2021-07-28 17:26 ` Junio C Hamano
2021-07-28 7:39 ` ZheNing Hu
2021-07-28 9:46 ` Phillip Wood
2021-07-28 11:01 ` ZheNing Hu
2021-07-28 16:52 ` 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=xmqqr1fi9wsj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=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=hanwen@google.com \
--cc=hariom18599@gmail.com \
--cc=phillip.wood123@gmail.com \
/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).