summaryrefslogtreecommitdiff
path: root/t/t5522-pull-symlink.sh
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2013-08-23 20:10:41 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-25 23:43:39 -0700
commit66ae9a57b887fce227b566b32bd47d2c37ada461 (patch)
tree97fa2a75ecc7d0bd41b9e98fa4379aff9f59e37a /t/t5522-pull-symlink.sh
parentt3404: make tests more self-contained (diff)
downloadtgif-66ae9a57b887fce227b566b32bd47d2c37ada461.tar.xz
t3404: rebase -i: demonstrate 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 Demonstrate this problem with a couple of specially crafted commits which initially have distinct abbreviated SHA-1's, but for which the abbreviated SHA-1's collide after a simple rewording of the first commit's message. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5522-pull-symlink.sh')
0 files changed, 0 insertions, 0 deletions