Browse Source

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>
maint
Stephan Beyer 16 years ago committed by Junio C Hamano
parent
commit
944019c8b3
  1. 2
      t/t3501-revert-cherry-pick.sh

2
t/t3501-revert-cherry-pick.sh

@ -45,6 +45,7 @@ test_expect_success 'cherry-pick after renaming branch' ' @@ -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' ' @@ -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


Loading…
Cancel
Save