Re: [PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision

2013-08-25 Thread Jonathan Nieder
Eric Sunshine wrote: --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1037,4 +1037,28 @@ test_expect_success 'rebase -i with --strategy and -X' ' test $(cat file1) = Z ' +test_expect_success 'short SHA-1 setup' ' + test_when_finished git checkout

[PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision

2013-08-23 Thread Eric Sunshine
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