summaryrefslogtreecommitdiffstats
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-01-23 13:28:19 +0100
committerJunio C Hamano <gitster@pobox.com>2020-01-23 21:48:12 +0100
commit26027625dd1ee358e2174a09d519252995d51662 (patch)
tree7f511fa73740ccf71e0c431e017454cba884c058 /fmt-merge-msg.h
parentrebase -i: re-fix short SHA-1 collision (diff)
downloadgit-26027625dd1ee358e2174a09d519252995d51662.tar.xz
git-26027625dd1ee358e2174a09d519252995d51662.zip
rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
When `rebase.missingCommitsCheck` is in effect, we use the backup of the todo list that was copied just before the user was allowed to edit it. That backup is, of course, just as susceptible to the hash collision as the todo list itself: a reworded commit could make a previously unambiguous short commit ID ambiguous all of a sudden. So let's not just copy the todo list, but let's instead write out the backup with expanded commit IDs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions