From: Junio C Hamano <redacted>
Date: Tue, 17 Mar 2020 22:02:21 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-with-colliding-hash' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=fa24bbe8645281b66213b47909864495fc5f7536;p=git.git

Merge branch 'js/rebase-i-with-colliding-hash' into maint

"git rebase -i" identifies existing commits in its todo file with
their abbreviated object name, which could become ambigous as it
goes to create new commits, and has a mechanism to avoid ambiguity
in the main part of its execution.  A few other cases however were
not covered by the protection against ambiguity, which has been
corrected.

* js/rebase-i-with-colliding-hash:
  rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
  rebase -i: re-fix short SHA-1 collision
  parse_insn_line(): improve error message when parsing failed
---

fa24bbe8645281b66213b47909864495fc5f7536