From: Martin von Zweigbergk Date: Tue, 11 Jun 2013 04:37:59 GMT Subject: Re: [PATCH v4 45/45] tests: update topology tests Message-ID: In-Reply-To: <1370796057-25312-46-git-send-email-felipe.contreras@gmail.com> On Sun, Jun 9, 2013 at 9:40 AM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > t/t3425-rebase-topology-merges.sh | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh > index 5400a05..96cc479 100755 > --- a/t/t3425-rebase-topology-merges.sh > +++ b/t/t3425-rebase-topology-merges.sh > @@ -70,9 +70,8 @@ test_run_rebase () { > test_linear_range "\'"$expected"\'" d.. > " > } > -#TODO: make order consistent across all flavors of rebase > -test_run_rebase success 'e n o' '' > -test_run_rebase success 'e n o' -m > +test_run_rebase success 'n o e' '' > +test_run_rebase success 'n o e' -m > test_run_rebase success 'n o e' -i If you do end up re-sending the series on top of my series, I'd prefer to see the end result having the first argument inlined, so these few lines become simply: test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i