[PATCH 0/3] fix interactive rebase short SHA-1 collision bug

This series addresses a bug [1][2] which can manifest during interactive rebase when the prefix of the new SHA-1 of an edited commit is shared with the abbreviated SHA-1 of a subsequent commit in the 'todo' list. When rebase attempts to process the subsequent command, it dies with a "short SHA1 badbeef is ambiguous" error.

patch 1: fix a problem in the interactive rebase test suite which can
    make subsequent tests fail

patch 2: add a test demonstrating the short SHA-1 collision bug

patch 3: fix the bug (this patch is from Junio [3] but augmented also to
    fix up "rebase --edit-todo")

[1]: http://thread.gmane.org/gmane.comp.version-control.git/229091 [2]: http://thread.gmane.org/gmane.comp.version-control.git/232012 [3]: http://thread.gmane.org/gmane.comp.version-control.git/229091/focus=229120

Eric Sunshine (2):
  t3404: restore specialized rebase-editor following commentchar test
  t3404: rebase: interactive: demonstrate short SHA-1 collision

Junio C Hamano (1):
  rebase: interactive: fix short SHA-1 collision

 git-rebase--interactive.sh    | 30 ++++++++++++++++++++++++++++++
 t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++
 2 files changed, 48 insertions(+)