Skip to content

Commit

Permalink
t7600 (merge): check reflog entry
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Aug 18, 2010
1 parent df516fb commit ff372c7
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion t/t7600-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit ff372c7

Please sign in to comment.