{"thread":{"id":"22242","subject":"[PATCH] t7111: fix bad HEAD in tests with unmerged entries","startedAt":"2010-01-16T09:20:26Z","lastAt":"2010-01-16T09:20:26Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"131862","messageId":"20100116092027.4292.89080.chriscool@tuxfamily.org","threadId":"22242","inReplyTo":null,"subject":"[PATCH] t7111: fix bad HEAD in tests with unmerged entries","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2010-01-16T09:20:26Z","receivedAt":"2010-01-16T09:20:26Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"When testing what happens on unmerged entries, the HEAD is the\ncommit we are starting from before the merge that fails and create\nthe unmerged entries. It is not the commit before.\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n t/t7111-reset-table.sh |   20 ++++++++++----------\n 1 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/t/t7111-reset-table.sh b/t/t7111-reset-table.sh\nindex 0a362a1..de896c9 100755\n--- a/t/t7111-reset-table.sh\n+++ b/t/t7111-reset-table.sh\n@@ -73,13 +73,13 @@ test_expect_success 'setting up branches to test with unmerged entries' '\n     git checkout branch1 &&\n     test_commit B1 file1 &&\n     git checkout branch2 &&\n-    test_commit B2 file1\n+    test_commit B file1\n '\n \n while read W1 I1 H1 T opt W2 I2 H2\n do\n     test_expect_success \"check: $W1 $I1 $H1 $T --$opt $W2 $I2 $H2\" '\n-\tgit reset --hard B2 &&\n+\tgit reset --hard B &&\n \ttest_must_fail git merge branch1 &&\n \tcat file1 >X_file1 &&\n \tif test \"$W2\" != \"XXXXX\"\n@@ -100,14 +100,14 @@ do\n \tfi\n     '\n done <<\\EOF\n-X U C D soft   XXXXX\n-X U C D mixed  X D D\n-X U C D hard   D D D\n-X U C D merge  D D D\n-X U C C soft   XXXXX\n-X U C C mixed  X C C\n-X U C C hard   C C C\n-X U C C merge  C C C\n+X U B C soft   XXXXX\n+X U B C mixed  X C C\n+X U B C hard   C C C\n+X U B C merge  C C C\n+X U B B soft   XXXXX\n+X U B B mixed  X B B\n+X U B B hard   B B B\n+X U B B merge  B B B\n EOF\n \n test_done\n-- \n1.6.6.271.gc8799\n"}]}