Junio C Hamano <gitster@xxxxxxxxx> writes: > Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > ... >> +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? Perhaps something like this. t/t3412-rebase-root.sh | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git i/t/t3412-rebase-root.sh w/t/t3412-rebase-root.sh index 29bb6d0..2408cf8 100755 --- i/t/t3412-rebase-root.sh +++ w/t/t3412-rebase-root.sh @@ -240,19 +240,24 @@ test_expect_success 'rebase -i --root with conflict (second part)' ' ' sed 's/#/ /g' > expect-conflict-p <<'EOF' -* Merge branch 'third' into other -|\## -| * 6 -* | Merge branch 'side' into other -|\ \## -| * | 5 -* | | 4 -|/ /## -* | 3 -|/## -* conflict -* 2 -* 1 +commit conflict3 conflict3~1 conflict3^2 +Merge branch 'third' into other +commit conflict3^2 conflict3~4 +6 +commit conflict3~1 conflict3~2 conflict3~1^2 +Merge branch 'side' into other +commit conflict3~1^2 conflict3~3 +5 +commit conflict3~2 conflict3~3 +4 +commit conflict3~3 conflict3~4 +3 +commit conflict3~4 conflict3~5 +conflict +commit conflict3~5 conflict3~6 +2 +commit conflict3~6 +1 EOF test_expect_success 'rebase -i -p --root with conflict (first part)' ' @@ -268,8 +273,9 @@ test_expect_success 'fix the conflict' ' test_expect_success 'rebase -i -p --root with conflict (second part)' ' git rebase --continue && - git log --graph --topo-order --pretty=tformat:"%s" > conflict3 && - test_cmp expect-conflict-p conflict3 + git rev-list --topo-order --parents --pretty="tformat:%s" HEAD | + git name-rev --stdin --name-only --refs=refs/heads/conflict3 >out && + test_cmp expect-conflict-p out ' test_done -- 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
