Merge branch 'ap/commit-author-mailmap' into maint

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index b2bd41918ee7f8b19e3ef906f27796f331ed9ea5..9bf2bdffd24b773a2eec636efdd534269f45e74b 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -96,11 +96,10 @@ test_expect_success 'non-limited update in subdir leaves root alone' '
        test_cmp expect actual
 '
 
-test_expect_success SYMLINKS 'replace a file with a symlink' '
+test_expect_success 'replace a file with a symlink' '
 
        rm foo &&
-       ln -s top foo &&
-       git add -u -- foo
+       test_ln_s_add top foo
 
 '