Re: [PATCH] Fix git rebase --continue to work with touched files

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 27, 2010, 10:16 UTC
Message-ID: <alpine.DEB.1.00.1007271215420.2983@bonsai2>
In-Reply-To: <1280225198-4539-1-git-send-email-ddkilzer@kilzer.net>

Hi,

On Tue, 27 Jul 2010, David D. Kilzer wrote:

Show 16 quoted lines

> When performing a non-interactive rebase, sometimes
> "git rebase --continue" will fail if an unmodified file is
> touched in the working directory:
> 
>     You must edit all merge conflicts and then
>     mark them as resolved using git add
> 
> This is caused by "git diff-files" reporting a difference
> between the index and the filesystem:
> 
>     :100644 100644 d00491...... 000000...... M	file
> 
> The fix is to run "git update-index --refresh" before
> "git diff-files" as is done in git-rebase--interactive.
> 
> Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>

ACK!

... and thanks! Dscho