Re: [PATCH 2/2] rebase: teach --autosquash to match on sha1 in addition to message

On Nov 4, 2010, at 3:44 AM, Sverre Rabbelier wrote:

On Thu, Nov 4, 2010 at 05:49, Kevin Ballard [off-list ref] wrote:

quoted

I just realized that this only works for sha1's of up to 7 characters.
If you provide more it won't match, as it's comparing against the sha1
given in the todo list. I wonder if it's worth resolving all sha1s to
their full length if the provided string is longer than 7 characters?

Well, not if you're resolving them based on the 7-character string
from the rebase todo list. If you run in to ambiguity with those
7-length hash we should instead increase the length of the hashes in
the todo list.

So I'd say, solve this by doing a prefix match?

Prefix match of what against what? If the 7-character string used in the
TODO list is already ambiguous, then the rebase itself would be expected
to fail. I'm inclined to just try to resolve the message in the fixup!
line itself to a full SHA1, and if that works, then try to match the
7-character sha1 with a prefix comparison.

-Kevin Ballard