summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-12 05:33:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-12 05:33:20 (GMT)
commit2f19a52c64237295de912e63f6cc8bc08040bf75 (patch)
treed2f9ef8b3ad310ab47209a74eb70a4df311b4c6c /t
parent5d4fcd9ac0478ef6c5164ef5175474d4e1437525 (diff)
parentd04520e3446acdcbdf1d30c812aa31d6a003c171 (diff)
downloadgit-2f19a52c64237295de912e63f6cc8bc08040bf75.zip
git-2f19a52c64237295de912e63f6cc8bc08040bf75.tar.gz
git-2f19a52c64237295de912e63f6cc8bc08040bf75.tar.bz2
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-xt/t1412-reflog-loop.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 7f519e5..647d888 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 &&