Re: [PATCH] rebase: do not fail silently when the HEAD could not be detached
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 8, 2009, 10:27 UTC
- Message-ID
- <alpine.DEB.1.00.0902081125400.10279@pacific.mpi-cbg.de>
- In-Reply-To
- <7v7i414qb9.fsf@gitster.siamese.dyndns.org>
Hi,
On Sat, 7 Feb 2009, Junio C Hamano wrote:
Show 18 quoted lines
> Björn Steinbrink <B.Steinbrink@gmx.de> writes: > > > On 2009.02.07 18:20:09 +0100, Johannes Schindelin wrote: > >> Since 6fd2f5e(rebase: operate on a detached HEAD), rebase operates on a > >> detached HEAD. However, it used "checkout -q" to detach the HEAD, which > >> hid an error message when, say, an untracked file would have to be > >> overwritten to detach the HEAD. > > > > Hm, in 324c2c317 "git-rebase: report checkout failure", that was > > switched from a stdout/stderr redirect to -q, so that those error > > messages are shown. And with a quick test, rebase/checkout complains > > just fine: > > Very interesting. > > Dscho, how did you get the "important part of error information is hidden" > failure that led to this patch? Did it come from code inspection and > speculation alone, or was there an actual failure case?
Hmm, sorry, I thought I got this with "my" Git, but it appears that due to some strange reason I do not understand completely, I was not actually using the Git binary from $HOME/bin/, but /usr/bin/.
> If I apply the patch t/t3400-rebase.sh from your message alone to > 'master', it does seem to pass.
Well, please ignore the patch, then. Or take the test alone.
Ciao, Dscho