Re: Rebase regression in v1.7.9?

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Feb 1, 2012, 19:30 UTC
Message-ID: <CAMP44s12Q3BdXzgr_m2Z0EpApiexngYoWgLi6NRONfCtr1zHKQ@mail.gmail.com>
In-Reply-To: <4F29761E.1030605@sohovfx.com>

On Wed, Feb 1, 2012 at 7:27 PM, Andrew Wong <andrew.w@sohovfx.com> wrote:

Show 13 quoted lines

> On 01/31/2012 05:56 PM, Felipe Contreras wrote:
>> The rebase will finish, but there will be a .git/CHERRY_PICK_HEAD file.
>>
> Ah, good catch. I can reproduce the issue. This is only happening in
> "rebase -i" because interactive rebase relies on cherry-pick, but not
> regular rebase. And now cherry-pick creates a state when there's a
> conflict (since 1.7.5?), which "rebase -i" didn't expect before. We
> probably just need to do a manual clean up before "rebase -i" continues.
>
> I'll try to come up with a patch for this. In the mean time, doing a
> "git reset" will remove that dangling file. Of course, you could always
> manually remove it. Does the dangling file cause a subsequent git
> command to fail?

No, it's just annoying with the __git_ps1 prompt stuff. Yeah, 'git reset' solves the problem, but it's much better to type 'git skip' instead... for now.

-- 
Felipe Contreras