| Message ID | 7e1ed49728df8dab771d77f1a076f0fa30975718.1627714878.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP | expand |
On 31/07/2021 08:01, ZheNing Hu via GitGitGadget wrote: > From: ZheNing Hu <adlternative@gmail.com> > > In the past, git cherry-pick would print such advice when > there was a conflict: > > 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' > > But in fact, when we want to cherry-pick multiple commits, > we should not use "git commit" after resolving conflicts, which > will make Git generate some errors. We should recommend users to > use `git cherry-pick --continue`, `git cherry-pick --abort`, just > like git rebase does. > > This is the improved advice: > > hint: Resolve all conflicts manually, mark them as resolved with > hint: "git add/rm <conflicted_files>", then run "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". This new wording matches what we have for rebase which is good, I am slightly worried that the lines end up being quite long though they are just under 80 characters. It might be worth splitting the line that mentions running "git cherry-pick --continue" so it is a bit shorter. Best Wishes Phillip > Mentored-by: Christian Couder <christian.couder@gmail.com> > Mentored-by Hariom Verma <hariom18599@gmail.com>: > Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> > Hepled-by: Junio C Hamano <gitster@pobox.com> > Signed-off-by: ZheNing Hu <adlternative@gmail.com> > --- > sequencer.c | 9 ++++++++- > t/t3507-cherry-pick-conflict.sh | 15 ++++++++++----- > 2 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/sequencer.c b/sequencer.c > index 83cf6a5da3c..f6e9d1fddd8 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -404,7 +404,14 @@ static void print_advice(struct replay_opts *opts, int show_hint) > if (msg) { > advise("%s\n", msg); > } else if (show_hint) { > - if (opts->no_commit) > + if (opts->action == REPLAY_PICK) { > + advise(_("Resolve all conflicts manually, mark them as resolved with\n" > + "\"git add/rm <conflicted_files>\", then run \"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->no_commit) > advise(_("after resolving the conflicts, mark the corrected paths\n" > "with 'git add <paths>' or 'git rm <paths>'")); > else > diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh > index f17621d1915..2cc3977f5a6 100755 > --- a/t/t3507-cherry-pick-conflict.sh > +++ b/t/t3507-cherry-pick-conflict.sh > @@ -53,9 +53,11 @@ test_expect_success 'advice from failed cherry-pick' " > 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' > + hint: Resolve all conflicts manually, mark them as resolved with > + hint: \"git add/rm <conflicted_files>\", then run \"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 && > > @@ -68,8 +70,11 @@ test_expect_success 'advice from failed cherry-pick --no-commit' " > 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: Resolve all conflicts manually, mark them as resolved with > + hint: \"git add/rm <conflicted_files>\", then run \"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 --no-commit picked 2>actual && > >
Phillip Wood <phillip.wood123@gmail.com> 于2021年8月1日周日 下午6:14写道： > > > This is the improved advice: > > > > hint: Resolve all conflicts manually, mark them as resolved with > > hint: "git add/rm <conflicted_files>", then run "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". > > This new wording matches what we have for rebase which is good, I am > slightly worried that the lines end up being quite long though they are > just under 80 characters. It might be worth splitting the line that > mentions running "git cherry-pick --continue" so it is a bit shorter. > Agree. > Best Wishes > > Phillip > Thanks. -- ZheNing Hu
diff --git a/sequencer.c b/sequencer.c index 83cf6a5da3c..f6e9d1fddd8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -404,7 +404,14 @@ static void print_advice(struct replay_opts *opts, int show_hint) if (msg) { advise("%s\n", msg); } else if (show_hint) { - if (opts->no_commit) + if (opts->action == REPLAY_PICK) { + advise(_("Resolve all conflicts manually, mark them as resolved with\n" + "\"git add/rm <conflicted_files>\", then run \"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->no_commit) advise(_("after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'")); else diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index f17621d1915..2cc3977f5a6 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -53,9 +53,11 @@ test_expect_success 'advice from failed cherry-pick' " 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' + hint: Resolve all conflicts manually, mark them as resolved with + hint: \"git add/rm <conflicted_files>\", then run \"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 && @@ -68,8 +70,11 @@ test_expect_success 'advice from failed cherry-pick --no-commit' " 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: Resolve all conflicts manually, mark them as resolved with + hint: \"git add/rm <conflicted_files>\", then run \"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 --no-commit picked 2>actual &&