From: "Johannes Schindelin" <Johannes.Schindelin@xxxxxx>
Hi Junio,
On Thu, 9 Feb 2017, Junio C Hamano wrote:
Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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".
> 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
Now just the doc update to do.... ;-)
I definitely think the 'fix' that allows the `fixup! <SHA-1>` as the subject
line is a good way to go for those who mix in the use of the gui and gitk
into their workflow (*)
--
Philip
(*) I just don't see the point of having multiple cli tty windows, and then
not using the gui/k windows that are part of the tool set.