Re: git mergetool broken when rerere active

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Jan 7, 2011, 02:50 UTC
Message-ID: <alpine.DEB.1.10.1101062058380.3800@debian>
In-Reply-To: <7v62u1bzeg.fsf@alter.siamese.dyndns.org>

On Thu, 6 Jan 2011, Junio C Hamano wrote:

Show 10 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > Probably we would need a "git rerere remaining" sobcommand that is similar
> > to status but also includes the "punted" paths.
> 
> ... which may look like this.
> 
> Replace use of "git rerere status" in bb0a484 (mergetool: Skip
> autoresolved paths, 2010-08-17) with "git rerere remainder" and see what
> happens.

I think it almost works. The only thing I can see that is not handled is the case where a file that had conflicts that have now been resolved and the file has been added to the index. These files still show up in 'git rerere remaining' and thus in 'git mergetool'. It is of course possible in mergetool to calculate the set difference between `git rerere remaining` and the set of added files, but would that be the right thing to do? Should 'git rerere remaining' rather be changed?

Would it be easier to add a 'git rerere resolved' that lists the files for which all conflicts have been resolved by rerere?x We could then make mergetool use the usual list of files from 'git ls-files -u' and subtract these files.