summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Antti Keränen <detegr@rbx.email>2020-08-13 20:42:57 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-13 11:32:34 -0700
commit5da69c0dacb65cf80fc80b53e652fefad7469bf1 (patch)
tree0b3a795ee3fbdeed68967fc8995c5f786619d60a /diff.h
parentGit 2.28 (diff)
downloadtgif-5da69c0dacb65cf80fc80b53e652fefad7469bf1.tar.xz
rebase -i: fix possibly wrong onto hash in todo
'todo_list_write_to_file' may overwrite the static buffer, originating from 'find_unique_abbrev', that was used to store the short commit hash 'c' for "# Rebase a..b onto c" message in the todo editor. This is because the buffer that is returned from 'find_unique_abbrev' is valid until 4 more calls to `find_unique_abbrev` are made. As 'todo_list_write_to_file' calls 'find_unique_abbrev' for each rebased commit, the hash for 'c' is overwritten if there are 4 or more commits in the rebase. This behavior has been broken since its introduction. Fix by storing the short onto commit hash in a different buffer that remains valid, before calling 'todo_list_write_to_file'. Found-by: Jussi Keränen <jussike@gmail.com> Signed-off-by: Antti Keränen <detegr@rbx.email> Acked-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions