diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-11 22:33:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-11 22:33:20 -0700 |
| commit | 2f19a52c64237295de912e63f6cc8bc08040bf75 (patch) | |
| tree | d2f9ef8b3ad310ab47209a74eb70a4df311b4c6c /t | |
| parent | 5d4fcd9ac0478ef6c5164ef5175474d4e1437525 (diff) | |
| parent | d04520e3446acdcbdf1d30c812aa31d6a003c171 (diff) | |
| download | git-2f19a52c64237295de912e63f6cc8bc08040bf75.tar.gz git-2f19a52c64237295de912e63f6cc8bc08040bf75.tar.xz | |
Merge branch 'jk/reset-reflog-message-fix' into maint
* jk/reset-reflog-message-fix:
reset: give better reflog messages
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1412-reflog-loop.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh index 7f519e5eb..647d88850 100755 --- a/t/t1412-reflog-loop.sh +++ b/t/t1412-reflog-loop.sh @@ -21,10 +21,10 @@ test_expect_success 'setup reflog with alternating commits' ' test_expect_success 'reflog shows all entries' ' cat >expect <<-\EOF - topic@{0} two: updating HEAD - topic@{1} one: updating HEAD - topic@{2} two: updating HEAD - topic@{3} one: updating HEAD + topic@{0} reset: moving to two + topic@{1} reset: moving to one + topic@{2} reset: moving to two + topic@{3} reset: moving to one topic@{4} branch: Created from HEAD EOF git log -g --format="%gd %gs" topic >actual && |