From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 09 Feb 2017 22:16:03 GMT
Subject: Re: Bug with fixup and autosquash
Message-ID: <xmqqd1ernh7g.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1702092301070.3496@virtualbox>

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:

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