From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:54:20 +0000 (-0800)
Subject: Merge branch 'js/rebase-i-with-colliding-hash'
X-Git-Tag: v2.26.0-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=251187084d5ebdb3ba898ba4a8f9b005b7626655;p=thirdparty%2Fgit.git

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
---

251187084d5ebdb3ba898ba4a8f9b005b7626655