Re: [PATCH] rebase [--onto O] A B: omit needless checkout

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] rebase [--onto O] A B: omit needless checkout

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:23

Johannes Sixt [off-list ref] writes:
Junio C Hamano schrieb:
quoted
This teaches "git rebase [--onto O] A B" to omit an unnecessary checkout
of branch B before it goes on.
...
This works for a frequent use-case of mine:
"Works" meaning "does not break", or "gives a great performance
improvement that it is worth having it early in a tagged release"?
  $ git rebase master devel

where I am already on branch master, and now want to rebase devel on top
of it.

The code seems to take care of a lot of corner cases and less frequent
use-cases, including using --onto, which I don't feel able to judge about.
quoted
+# git reset --hard "$onto^0"
Don't forget to remove this line. ;)

Re: [PATCH] rebase [--onto O] A B: omit needless checkout

From: Johannes Sixt <hidden>
Date: 2016-06-15 22:44:24

Junio C Hamano schrieb:
Johannes Sixt [off-list ref] writes:
quoted
Junio C Hamano schrieb:
quoted
This teaches "git rebase [--onto O] A B" to omit an unnecessary checkout
of branch B before it goes on.
...
This works for a frequent use-case of mine:
"Works" meaning "does not break", or "gives a great performance
improvement that it is worth having it early in a tagged release"?
Sorry for being so terse. "Works", of course, means "works as expected",
and the "expected" part of that is that the annoyance is no longer
present, which is the unnecessary checkout.

But given how intrusive the patch is ("just to remove an unnecessary
checkout"), I'd say this is post-1.5.5 material. Also, the fact that you
had to post a fix-up is an indication that there are probably a number of
corner cases that need an extended testing period.

-- Hannes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help