Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > +test_expect_success 'rebase -i --root with conflict (first part)' ' > + git checkout -b conflict2 other && > + GIT_EDITOR=: test_must_fail git rebase -i --root --onto master && > + git ls-files -u | grep "B$" > +' Maybe I am misrecalling things but didn't we have reports from people on some platforms that single-shot exporting of the environment like this one does not work for them? > +test_expect_success 'fix the conflict' ' > + echo 3 > B && > + git add B > +' > + > +test_expect_success 'rebase -i --root with conflict (second part)' ' > + git rebase --continue && > + git log --pretty=tformat:"%s" > conflict2 && > + test_cmp expect-conflict conflict2 > +' > + > +sed 's/#/ /g' > expect-conflict-p <<'EOF' > +* Merge branch 'third' into other > +|\## > +| * 6 > +* | Merge branch 'side' into other > +|\ \## > +| * | 5 > +* | | 4 > +|/ /## > +* | 3 > +|/## > +* conflict > +* 2 > +* 1 > +EOF I do not like this very much. Future improvements of the graph drawing algorithm (one obvious "flaw" you are exposing by the above is that it has trailing whitespaces that can be trimmed, and somebody else may be inclined to fix) would break the expectation this test vector has. Do you have to compare the topology this way, or are there other more reliable ways? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
