tree ea556c7380d8b45c04e92a2e3d6c07ed98700e22
parent c9a33e5e5d7e124feb86ccff08ea466faff53b26
parent 26027625dd1ee358e2174a09d519252995d51662
author Junio C Hamano <gitster@pobox.com> 1581713660 -0800
committer Junio C Hamano <gitster@pobox.com> 1581713660 -0800

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

"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