From: Phillip Wood <phillip.wood123@gmail.com>
To: ZheNing Hu via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: "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>,
"ZheNing Hu" <adlternative@gmail.com>
Subject: Re: [PATCH v5] [GSOC] cherry-pick: use better advice message
Date: Wed, 18 Aug 2021 10:51:40 +0100 [thread overview]
Message-ID: <dcccd4af-e8b1-31e2-f271-4161ec4853d0@gmail.com> (raw)
In-Reply-To: <pull.1010.v5.git.1629075306706.gitgitgadget@gmail.com>
On 16/08/2021 01:55, ZheNing Hu via GitGitGadget wrote:
> From: ZheNing Hu <adlternative@gmail.com>
> [...]
> sequencer.c | 16 +++++++++++++++-
> t/t3501-revert-cherry-pick.sh | 20 ++++++++++++++++++++
> t/t3507-cherry-pick-conflict.sh | 17 ++++++++++-------
> 3 files changed, 45 insertions(+), 8 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 0bec01cf38e..2dd73d24a87 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -403,7 +403,7 @@ static void print_advice(struct repository *r, int show_hint,
> char *msg = getenv("GIT_CHERRY_PICK_HELP");
>
> if (msg) {
> - fprintf(stderr, "%s\n", msg);
> + advise("%s\n", msg);
> /*
> * A conflict has occurred but the porcelain
> * (typically rebase --interactive) wants to take care
> @@ -418,6 +418,20 @@ static void print_advice(struct repository *r, int show_hint,
> if (opts->no_commit)
> advise(_("after resolving the conflicts, mark the corrected paths\n"
> "with 'git add <paths>' or 'git rm <paths>'"));
> + else if (opts->action == REPLAY_PICK)
> + advise(_("Resolve all conflicts manually, mark them as resolved with\n"
> + "\"git add/rm <conflicted_files>\", then run\n"
> + "\"git cherry-pick --continue\".\n"
> + "You can instead skip this commit: run \"git cherry-pick --skip\".\n"
> + "To abort and get back to the state before \"git cherry-pick\",\n"
> + "run \"git cherry-pick --abort\"."));
> + else if (opts->action == REPLAY_REVERT)
> + advise(_("Resolve all conflicts manually, mark them as resolved with\n"
> + "\"git add/rm <conflicted_files>\", then run\n"
> + "\"git revert --continue\".\n"
> + "You can instead skip this commit: run \"git revert --skip\".\n"
> + "To abort and get back to the state before \"git revert\",\n"
> + "run \"git revert --abort\"."));
Thanks for making the revert advice better as well
> else
> advise(_("after resolving the conflicts, mark the corrected paths\n"
> "with 'git add <paths>' or 'git rm <paths>'\n"
I think this last else arm should probably be a bug now as anything
other than cherry-pick or revert should be setting GIT_CHERRY_PICK_HELP
else
BUG("unexpected pick action in print_advice()");
> diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
> index 9d100cd1884..6766aed7282 100755
> --- a/t/t3501-revert-cherry-pick.sh
> +++ b/t/t3501-revert-cherry-pick.sh
> @@ -158,4 +158,24 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
> grep -q "^modified$" renamed
> '
>
> +test_expect_success 'advice from failed revert' '
> + echo dream >dream &&
> + git add dream &&
> + git commit -m "add dream" &&
A minor comment: you can condense these three lines by using test_commit
(see test-lib-functions.sh for the documentation)
test_commit "add dream" dream dream
> + dream_oid=$(git rev-parse --short HEAD) &&
> + cat <<-EOF >expected &&
> + error: could not revert $dream_oid... add dream
> + hint: Resolve all conflicts manually, mark them as resolved with
> + hint: "git add/rm <conflicted_files>", then run
> + hint: "git revert --continue".
> + hint: You can instead skip this commit: run "git revert --skip".
> + hint: To abort and get back to the state before "git revert",
> + hint: run "git revert --abort".
> + EOF
> + echo dream >>dream &&
> + git add dream &&
> + git commit -m "double-add dream" &&
test_commit can also append to a file
test_commit --append "double-add dream" dream dream
This is looking very close to being ready now I think
Thanks
Phillip
> + test_must_fail git revert HEAD^ 2>actual &&
> + test_cmp expected actual
> +'
> test_done
> diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
> index 014001b8f32..cb2ebea9ad3 100755
> --- a/t/t3507-cherry-pick-conflict.sh
> +++ b/t/t3507-cherry-pick-conflict.sh
> @@ -47,20 +47,23 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
> test "$head" = "$newhead"
> '
>
> -test_expect_success 'advice from failed cherry-pick' "
> +test_expect_success 'advice from failed cherry-pick' '
> pristine_detach initial &&
>
> - picked=\$(git rev-parse --short picked) &&
> + picked=$(git rev-parse --short picked) &&
> cat <<-EOF >expected &&
> - error: could not apply \$picked... picked
> - hint: after resolving the conflicts, mark the corrected paths
> - hint: with 'git add <paths>' or 'git rm <paths>'
> - hint: and commit the result with 'git commit'
> + error: could not apply $picked... picked
> + hint: Resolve all conflicts manually, mark them as resolved with
> + hint: "git add/rm <conflicted_files>", then run
> + hint: "git cherry-pick --continue".
> + hint: You can instead skip this commit: run "git cherry-pick --skip".
> + hint: To abort and get back to the state before "git cherry-pick",
> + hint: run "git cherry-pick --abort".
> EOF
> test_must_fail git cherry-pick picked 2>actual &&
>
> test_cmp expected actual
> -"
> +'
>
> test_expect_success 'advice from failed cherry-pick --no-commit' "
> pristine_detach initial &&
>
> base-commit: daab8a564f8bbac55f70f8bf86c070e001a9b006
>
next prev parent reply other threads:[~2021-08-18 9:51 UTC|newest]
Thread overview: 32+ 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
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 [this message]
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
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=dcccd4af-e8b1-31e2-f271-4161ec4853d0@gmail.com \
--to=phillip.wood123@gmail.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=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).