diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 06:56:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 21:02:03 (GMT) |
| commit | ff372c7851f36bfe0e113e23d247cb9033e79559 (patch) | |
| tree | 650fe1c4fee93c48d2c29fef565a6c953eaaaa5a /t/t7600-merge.sh | |
| parent | df516fb55891ae57676515d437d0e2cb3c8ad429 (diff) | |
| download | git-ff372c7851f36bfe0e113e23d247cb9033e79559.zip git-ff372c7851f36bfe0e113e23d247cb9033e79559.tar.gz git-ff372c7851f36bfe0e113e23d247cb9033e79559.tar.bz2 | |
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>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | 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' |