Re: [PATCH] rebase: do not fail silently when the HEAD could not be detached
- From
Björn Steinbrink <b.steinbrink@gmx.de>
- Date
- Feb 7, 2009, 23:35 UTC
- Message-ID
- <20090207233524.GD11623@atjola.homenet>
- In-Reply-To
- <679be9321b4cf4f694917cb9eebba70376a43a0a.1234027102u.git.johannes.schindelin@gmx.de>
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:
doener@atjola:g (master) $ git checkout -q bar error: Untracked working tree file 'file' would be overwritten by merge. doener@atjola:g (master) $ git rebase bar First, rewinding head to replay your work on top of it... error: Untracked working tree file 'file' would be overwritten by merge. could not detach HEAD
doener@atjola:g (master) $ git --version git version 1.6.2.rc0
Same with next and pu.
Björn