diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 20:31:48 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 20:31:48 +0400 |
commit | 81b43b54b2b6cfe917820b26bf206254d8b6738e (patch) | |
tree | 4ecbf2b05ad5e27fed309025a28c91127c074a82 /t | |
parent | abd3fd358b73c3a09eb0e70ebe91cd8807c9777d (diff) | |
parent | 643cb5f7c99e77a4a3e97213dd226a7dc2650c02 (diff) |
Merge branch 'cc/maint-commit-reflog-msg' into maint
* cc/maint-commit-reflog-msg:
commit: use value of GIT_REFLOG_ACTION env variable as reflog message
Diffstat (limited to 't')
-rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 7f858151d4..e4fbf7a210 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -47,7 +47,8 @@ test_expect_success 'cherry-pick after renaming branch' ' git cherry-pick added && test $(git rev-parse HEAD^) = $(git rev-parse rename2) && test -f opos && - grep "Add extra line at the end" opos + grep "Add extra line at the end" opos && + git reflog -1 | grep cherry-pick ' @@ -57,7 +58,8 @@ test_expect_success 'revert after renaming branch' ' git revert added && test $(git rev-parse HEAD^) = $(git rev-parse rename1) && test -f spoo && - ! grep "Add extra line at the end" spoo + ! grep "Add extra line at the end" spoo && + git reflog -1 | grep revert ' |