t7600 (merge): check reflog entry

[git.git] / t / t7600-merge.sh

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 64a4265cfcdcfa79085328308509ad60b113c0e2..6e839a609c7fa255b2b48737ec446aebdb5e86b7 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -149,10 +149,16 @@ test_expect_success 'reject non-strategy with a git-merge-foo name' '
 '
 
 test_expect_success 'merge c0 with c1' '
+       echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
+
        git reset --hard c0 &&
        git merge c1 &&
        verify_merge file result.1 &&
-       verify_head "$c1"
+       verify_head "$c1" &&
+
+       git reflog -1 >reflog.actual &&
+       sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
+       test_cmp reflog.expected reflog.fuzzy
 '
 
 test_debug 'git log --graph --decorate --oneline --all'