diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:33 -0700 |
| commit | 75745bc7041a17f6cebf719a50157eb5b1d3bfe9 (patch) | |
| tree | a300ce9ff1b2bdc314945d65ad329198816035a8 /t | |
| parent | Merge branch 'jc/diff-index-refactor' (diff) | |
| parent | reset: give better reflog messages (diff) | |
| download | tgif-75745bc7041a17f6cebf719a50157eb5b1d3bfe9.tar.xz | |
Merge branch 'jk/reset-reflog-message-fix'
* 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 7f519e5ebe..647d888507 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 && |