Stephan BeyerThe basic idea of t3501 is to check whether revert and cherry-pick works on renamed files. But as there is no pure cherry-pick/revert test, it is good to also check if commits are actually done in that scenario.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> ---
This patch was originally motivated because of a bug that I introduced in my repo while hacking on cherry-pick/revert. None of the cherry-pick test cases failed, so I thought this tiny addition is useful.
t/t3501-revert-cherry-pick.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
Show changes to t/t3501-revert-cherry-pick.sh +2 −0
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 6da2128..bb4cf00 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -45,6 +45,7 @@ test_expect_success 'cherry-pick after renaming branch' ' git checkout rename2 && git cherry-pick added && + test $(git rev-parse HEAD^) = $(git rev-parse rename2) && test -f opos && grep "Add extra line at the end" opos @@ -54,6 +55,7 @@ test_expect_success 'revert after renaming branch' ' git checkout rename1 && git revert added && + test $(git rev-parse HEAD^) = $(git rev-parse rename1) && test -f spoo && ! grep "Add extra line at the end" spoo
-- 1.6.1.160.gecdb