Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > From: Junio C Hamano <gitster@xxxxxxxxx> > > d911d14 (rebase -i: learn to rebase root commit, 2009-01-02) tried to > remember the --root flag across a merge conflict in a broken way. > Introduce a flag file $DOTEST/rebase-root to fix and clarify. > > While at it, also make sure $UPSTREAM is always initialized to guard > against existing values in the environment. > > [tr: added tests] > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx> > --- > > Junio C Hamano wrote: >> Since you never use the value stored in "$DOTEST/upstream" for anything >> else anyway, how about doing something like this instead? It would make >> the meaning of the file used as a state variable much clearer. > > Yes, thanks, a patch precisely "like this" is in fact the right fix. > > I came up with some tests that try a conflicted --root rebase of each > flavour, to guard against the problem in the future. I wasn't > entirely sure how to shape this into a patch, but here's a version > that forges patch message and sign-off in your name. > > Dscho, with that confusion cleared, you can add my Ack to your 1/2 > (unchanged, though I'm afraid you'll get a textual conflict). Ok, so I'll queue this to 'master' as a bugfix. Thanks. -- 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
