Re: Bug with fixup and autosquash

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 10, 2017, 15:57 UTC
Message-ID: <alpine.DEB.2.20.1702101654500.3496@virtualbox>
In-Reply-To: <xmqqd1ernh7g.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Thu, 9 Feb 2017, Junio C Hamano wrote:

Show 8 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > Almost. While I fixed the performance issues as well as the design
> > allowed, I happened to "fix" the problem where an incomplete prefix
> > match could be favored over an exact match.
> 
> Hmph.  Would it require too much further work to do what you said the
> code does:

I was just being overly precise. I *did* fix the problem. But since it was not my intention, I quoted the verb "fix".

Show 8 quoted lines

> > The rebase--helper code (specifically, the patch moving autosquash
> > logic into it: https://github.com/dscho/git/commit/7d0831637f) tries
> > to match exact onelines first, and falls back to prefix matching only
> > after that.
> 
> If the code matches exact onlines and then falls back to prefix, I do
> not think incomplete prefix would be mistakenly chosen over an exact
> one, so perhaps your code already does the right thing?

The code does exactly that. It does even more: as `fixup! <SHA-1>` is allowed (for SHA-1s that have been mentioned in previous `pick` lines), it tries to match that before falling back to the incomplete prefix match.

Ciao, Johannes