global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-31 12:00:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/maint-commit-reflog-msg' into next

Browse Source 
* cc/maint-commit-reflog-msg:
  commit: use value of GIT_REFLOG_ACTION env variable as reflog message
This commit is contained in:
Junio C Hamano
2010-06-17 08:27:58 -07:00
parent 7f5f43013d 643cb5f7c9
commit 863be4dfa1
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3501-revert-cherry-pick.sh
View File

@@ -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
'