diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2009-01-15 16:03:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-16 01:22:12 +0300 |
| commit | 944019c8b3896ff8d169864096eedc60155c80a4 (patch) | |
| tree | 7cec8396c80ed97e18f24293cb38c39326486604 | |
| parent | be17262d13f5f3df5ee9635b11dad180613e9cbd (diff) | |
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>
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 6da212825a..bb4cf00d78 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 |