mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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 <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
be17262d13
commit
944019c8b3
|
@ -45,6 +45,7 @@ test_expect_success 'cherry-pick after renaming branch' '
|
||||||
|
|
||||||
git checkout rename2 &&
|
git checkout rename2 &&
|
||||||
git cherry-pick added &&
|
git cherry-pick added &&
|
||||||
|
test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
|
||||||
test -f opos &&
|
test -f opos &&
|
||||||
grep "Add extra line at the end" opos
|
grep "Add extra line at the end" opos
|
||||||
|
|
||||||
|
@ -54,6 +55,7 @@ test_expect_success 'revert after renaming branch' '
|
||||||
|
|
||||||
git checkout rename1 &&
|
git checkout rename1 &&
|
||||||
git revert added &&
|
git revert added &&
|
||||||
|
test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
|
||||||
test -f spoo &&
|
test -f spoo &&
|
||||||
! grep "Add extra line at the end" spoo
|
! grep "Add extra line at the end" spoo
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue