Merge branch 'dk/version-gen-gitdir'

diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 297ddb5a25b682412851aed70370771aa5a15976..55d549fcf441be927bc43b2c41107a90aa614c2a 100755 (executable)
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -8,40 +8,40 @@ test_expect_success setup '
 
        rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../COPYING >foo &&
-       ln -s linklink bar &&
-       git add foo bar &&
+       test_ln_s_add linklink bar &&
+       git add foo &&
        git commit -a -m Initial &&
        git tag one &&
 
-       rm -f foo bar &&
+       git rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../COPYING >bar &&
-       ln -s linklink foo &&
-       git add foo bar &&
+       test_ln_s_add linklink foo &&
+       git add bar &&
        git commit -a -m Second &&
        git tag two &&
 
-       rm -f foo bar &&
+       git rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../COPYING >foo &&
        git add foo &&
        git commit -a -m Third &&
        git tag three &&
 
        mv foo bar &&
-       ln -s linklink foo &&
-       git add foo bar &&
+       test_ln_s_add linklink foo &&
+       git add bar &&
        git commit -a -m Fourth &&
        git tag four &&
 
        # This is purely for sanity check
 
-       rm -f foo bar &&
+       git rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../COPYING >foo &&
        cat "$TEST_DIRECTORY"/../Makefile >bar &&
        git add foo bar &&
        git commit -a -m Fifth &&
        git tag five &&
 
-       rm -f foo bar &&
+       git rm -f foo bar &&
        cat "$TEST_DIRECTORY"/../Makefile >foo &&
        cat "$TEST_DIRECTORY"/../COPYING >bar &&
        git add foo bar &&