diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 01:18:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 01:18:01 (GMT) |
| commit | 0346e324c2acdd763224cc071d6a6d0f55a982a1 (patch) | |
| tree | 2c50191d9018adbe2d058b035d98c50626512ef9 | |
| parent | 1f73566af5bec28cd8489c6139a9ede95817349c (diff) | |
| parent | 6f53c3b21e3899716caccc2f88a1186ca7fa0f60 (diff) | |
| download | git-0346e324c2acdd763224cc071d6a6d0f55a982a1.zip git-0346e324c2acdd763224cc071d6a6d0f55a982a1.tar.gz git-0346e324c2acdd763224cc071d6a6d0f55a982a1.tar.bz2 | |
Merge branch 'cc/reset-more'
* cc/reset-more:
t7111: fix bad HEAD in tests with unmerged entries
| -rwxr-xr-x | t/t7111-reset-table.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/t/t7111-reset-table.sh b/t/t7111-reset-table.sh index 0a362a1..de896c9 100755 --- a/t/t7111-reset-table.sh +++ b/t/t7111-reset-table.sh @@ -73,13 +73,13 @@ test_expect_success 'setting up branches to test with unmerged entries' ' git checkout branch1 && test_commit B1 file1 && git checkout branch2 && - test_commit B2 file1 + test_commit B file1 ' while read W1 I1 H1 T opt W2 I2 H2 do test_expect_success "check: $W1 $I1 $H1 $T --$opt $W2 $I2 $H2" ' - git reset --hard B2 && + git reset --hard B && test_must_fail git merge branch1 && cat file1 >X_file1 && if test "$W2" != "XXXXX" @@ -100,14 +100,14 @@ do fi ' done <<\EOF -X U C D soft XXXXX -X U C D mixed X D D -X U C D hard D D D -X U C D merge D D D -X U C C soft XXXXX -X U C C mixed X C C -X U C C hard C C C -X U C C merge C C C +X U B C soft XXXXX +X U B C mixed X C C +X U B C hard C C C +X U B C merge C C C +X U B B soft XXXXX +X U B B mixed X B B +X U B B hard B B B +X U B B merge B B B EOF test_done |