Merge branch 'rs/mailinfo-header-cmp' into maint

diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index df921d1f33df34dd2b2631580f8d53b18270662a..1e5b3948dfc5d28a070ba83db361163002e7c3ae 100755 (executable)
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -10,17 +10,15 @@ test_expect_success 'Initialize repository' '
        git commit -m a
 '
 
-test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
+test_expect_success 'Setup rename across paths each below D/F conflicts' '
        mkdir b &&
-       ln -s ../a b/a &&
-       git add b &&
+       test_ln_s_add ../a b/a &&
        git commit -m b &&
 
        git checkout -b branch &&
        rm b/a &&
-       mv a b/a &&
-       ln -s b/a a &&
-       git add . &&
+       git mv a b/a &&
+       test_ln_s_add b/a a &&
        git commit -m swap &&
 
        >f1 &&
@@ -28,7 +26,7 @@ test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts
        git commit -m f1
 '
 
-test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' '
+test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
        git reset --hard &&
        git checkout master^0 &&
        git cherry-pick branch
@@ -76,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
        echo content > sub/file &&
        echo foo > othersub/whatever &&
        git add -A &&
-       git commit -m "Common commmit" &&
+       git commit -m "Common commit" &&
 
        git rm -rf othersub &&
        git mv sub/file othersub &&