diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-08-23 20:10:42 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-08-25 23:43:40 -0700 |
commit | 75c69766554c4b34ede65502d481dd7beb7f3388 (patch) | |
tree | d17b7485c2c73bd6d493b24986ccbacf0549055d /t/t3210-pack-refs.sh | |
parent | t3404: rebase -i: demonstrate short SHA-1 collision (diff) | |
download | tgif-75c69766554c4b34ede65502d481dd7beb7f3388.tar.xz |
rebase -i: fix short SHA-1 collision
The 'todo' sheet for interactive rebase shows abbreviated SHA-1's and
then performs its operations upon those shortened values. This can lead
to an abort if the SHA-1 of a reworded or edited commit is no longer
unique within the abbreviated SHA-1 space and a subsequent SHA-1 in the
todo list has the same abbreviated value.
For example:
edit f00dfad first
pick badbeef second
If, after editing, the new SHA-1 of "first" also has prefix badbeef,
then the subsequent 'pick badbeef second' will fail since badbeef is no
longer a unique SHA-1 abbreviation:
error: short SHA1 badbeef is ambiguous.
fatal: Needed a single revision
Invalid commit name: badbeef
Fix this problem by expanding the SHA-1's in the todo list before
performing the operations.
[es: also collapse & expand SHA-1's for --edit-todo; respect
core.commentchar in transform_todo_ids(); compose commit message]
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3210-pack-refs.sh')
0 files changed, 0 insertions, 0 deletions