Re: [RFC PATCH] add t3420-rebase-topology

2012-09-29 Thread Chris Webb
Martin von Zweigbergk writes: > For consistency, it seems like "git rebase -p --root" should always be > a no-op, while "git rebase [-i/-m] --root" should be no-op if the > history has no merges. Also, since "git rebase -i" tries to > fast-forward through existing commits, it seems like "git reba

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-28 Thread Martin von Zweigbergk
On Thu, Sep 27, 2012 at 5:20 AM, Chris Webb wrote: > You're right that rebase --root without --onto always creates a brand new > root as a result of the implementation using a sentinel commit. Clearly this > is what's wanted with --interactive That's not as clear as one might first think. "git re

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-27 Thread Chris Webb
Martin von Zweigbergk writes: > On Tue, Sep 18, 2012 at 12:53 AM, Johannes Sixt wrote: > > > Why? Is it more like "--root implies --force"? > > It doesn't currently exactly imply --force, but the effect is the > same. Also see my reply to Junio's email in this thread. > > Maybe Chris has some

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-26 Thread Martin von Zweigbergk
[+Chris Webb regarding "git rebase --root"] First of all, thanks for a meticulous review! On Tue, Sep 18, 2012 at 12:53 AM, Johannes Sixt wrote: > Am 9/18/2012 8:31, schrieb Martin von Zweigbergk: > > Since here and in the following tests the test cases and test descriptions > vary in the same w

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-21 Thread Martin von Zweigbergk
On Tue, Sep 18, 2012 at 12:51 AM, Junio C Hamano wrote: > Martin von Zweigbergk writes: > >> do you agree >> that 'rebase --onto does not re-apply patches in onto' is desirable? > > This depends on how you look at --onto. Recall the most typical and > the original use case of rebase: > >

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-18 Thread Johannes Sixt
Am 9/18/2012 8:31, schrieb Martin von Zweigbergk: > Add more test cases to check that the topology after a rebase is as > expected. Conflicts are not considered, but patch-equivalence is. > --- > > Tests pass and fail as indicated by the suffix > (_success/_failure). Your input especially apprecia

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-18 Thread Junio C Hamano
Martin von Zweigbergk writes: > do you agree > that 'rebase --onto does not re-apply patches in onto' is desirable? This depends on how you look at --onto. Recall the most typical and the original use case of rebase: A'--C' your rebased work

[RFC PATCH] add t3420-rebase-topology

2012-09-17 Thread Martin von Zweigbergk
Add more test cases to check that the topology after a rebase is as expected. Conflicts are not considered, but patch-equivalence is. --- Tests pass and fail as indicated by the suffix (_success/_failure). Your input especially appreciated on whether you agree with the intent of the test cases. Fo