Hi Paul, On 2015-05-18 15:32, Paul Tan wrote: > diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh > index 4a2c0a1..3bc0594 100755 > --- a/t/t5520-pull.sh > +++ b/t/t5520-pull.sh > @@ -164,6 +164,26 @@ test_expect_success 'fail if upstream branch does > not exist' ' > test "$(cat file)" = file > ' > > +test_expect_success 'fail if the index has unresolved entries' ' > + git checkout -b third second^ && > + test_when_finished "git checkout -f copy && git branch -D third" && If you agree with my argument in 2/8, it would be nice to drop this line, too. > + test "$(cat file)" = file && > + echo modified2 >file && > + git commit -a -m modified2 && These two lines could be combined into "test_commit modified2 file". Ciao, Dscho -- 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