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 master" && > + git checkout --orphan collide && > + git rm -rf . && > + ( > + unset test_tick && > + test_commit collide1 collide && > + test_commit --notick collide2 collide && > + test_commit --notick collide3 collide > + ) Style: would be clearer indented: ( unset test_tick && test_commit ... ) > +test_expect_failure 'short SHA-1 collide' ' > + test_when_finished "reset_rebase && git checkout master" && > + git checkout collide && > + ( > + unset test_tick && Likewise. Thanks, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html