Skip to content

Commit 944019c

Browse files
sbeyergitster
authored andcommitted
t3501: check that commits are actually done
The 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent be17262 commit 944019c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

t/t3501-revert-cherry-pick.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ test_expect_success 'cherry-pick after renaming branch' '
4545
4646
git checkout rename2 &&
4747
git cherry-pick added &&
48+
test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
4849
test -f opos &&
4950
grep "Add extra line at the end" opos
5051
@@ -54,6 +55,7 @@ test_expect_success 'revert after renaming branch' '
5455
5556
git checkout rename1 &&
5657
git revert added &&
58+
test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
5759
test -f spoo &&
5860
! grep "Add extra line at the end" spoo
5961

0 commit comments

Comments
 (0)