Phillip Wood <phillip.wood123@xxxxxxxxx> 于2021年8月18日周三 下午5:51写道: > > Thanks for making the revert advice better as well > Thanks for reviewing too. > > 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()"); > Maybe you are right, If no one else will touch it, it may be reasonable to set it as BUG(). > > 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 > Thanks, I may also need a --no-tag option, because "add dream" is not a valid tag name. > > + 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 > Same too, test_commit --append --no-tag "double-add dream" dream dream > This is looking very close to being ready now I think > > Thanks > > Phillip > Thanks. -- ZheNing Hu