tree ba728a9450d57477cf14fa30a1a0681b521e0418
parent a7a2e12b6eb97126f9d07298f281eb1c91730750
parent 26027625dd1ee358e2174a09d519252995d51662
author Junio C Hamano <gitster@pobox.com> 1584482541 -0700
committer Junio C Hamano <gitster@pobox.com> 1584482541 -0700

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