diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
| commit | fa24bbe8645281b66213b47909864495fc5f7536 (patch) | |
| tree | ba728a9450d57477cf14fa30a1a0681b521e0418 /commit-graph.c | |
| parent | Merge branch 'jk/clang-sanitizer-fixes' into maint (diff) | |
| parent | rebase -i: also avoid SHA-1 collisions with missingCommitsCheck (diff) | |
| download | git-fa24bbe8645281b66213b47909864495fc5f7536.tar.gz git-fa24bbe8645281b66213b47909864495fc5f7536.zip | |
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
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions