t7600 (merge): check reflog entry
The details of the reflog message are not important, but including something sane in the reflog is. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 17, 2010 at 01:56 UTC
ff372c7851f36bfe0e113e23d247cb9033e79559
1 file changed
+7
-1
t/t7600-merge.sh
+7
-1
@@ -149,10 +149,16 @@ test_expect_success 'reject non-strategy with a git-merge-foo name' '
149
'
150
151
test_expect_success 'merge c0 with c1' '
152
+ echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
153
+
154
git reset --hard c0 &&
155
git merge c1 &&
156
verify_merge file result.1 &&
155
- verify_head "$c1"
157
+ verify_head "$c1" &&
158
+
159
+ git reflog -1 >reflog.actual &&
160
+ sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
161
+ test_cmp reflog.expected reflog.fuzzy
162
'
163
164
test_debug 'git log --graph --decorate --oneline --all'