Re: [PATCH] rebase: do not fail silently when the HEAD could not be detached

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux