Elijah Newren <newren@xxxxxxxxx> writes: Just an addition to what Johannes Sixt wrote. > @@ -255,7 +259,16 @@ test_expect_success 'setup 8' ' > git mv a e && > git add e && > test_tick && > - git commit -m "rename a->e" > + git commit -m "rename a->e" && > + if test_have_prereq SYMLINKS > + then > + git checkout rename-ln && > + git mv a e && > + ln -s e a && > + git add a e && > + test_tick && > + git commit -m "rename a->e, symlink a->e" > + fi Wouldn't it be better to move it to separate test_expect_success entry... if SYMLINK prerequisite would be really needed (Johannes says it isn't). > +if test_have_prereq SYMLINKS > +then > + test_expect_success 'merge-recursive rename vs. rename/symlink' ' [...] > +fi It is better to use +test_expect_success SYMLINKS 'merge-recursive rename vs. rename/symlink' ' form, see t/README about three-argument form of test_expect_success. -- Jakub Narebski Poland ShadeHawk on #git -- 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