Subject: [PATCH 04/24] t7600 (merge): check reflog entry

From: Jonathan Nieder <[email-masked]>
Date: Tue, 17 Aug 2010 01:56:13 -0500

The details of the reflog message are not important, but
including something sane in the reflog is.

Signed-off-by: Jonathan Nieder <[email-masked]>
---
 t/t7600-merge.sh |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 64a4265..6e839a6 100755
--- 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'
-- 
1.7.2.1.544.ga752d.dirty