Merge branch 'sp/fetch-fix'

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index c044044f8098bfda43a70dab31eb1e5ac53a94fa..0a6fe53375bb26e5c3a69d503f6f13833a2020fa 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -10,26 +10,29 @@ test_description='Format-patch skipping already incorporated patches'
 test_expect_success setup '
 
        for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
-       git add file &&
+       cat file >elif &&
+       git add file elif &&
        git commit -m Initial &&
        git checkout -b side &&
 
        for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
-       git update-index file &&
-       git commit -m "Side change #1" &&
+       chmod +x elif &&
+       git update-index file elif &&
+       git update-index --chmod=+x elif &&
+       git commit -m "Side changes #1" &&
 
        for i in D E F; do echo "$i"; done >>file &&
        git update-index file &&
-       git commit -m "Side change #2" &&
-       git tag C1 &&
+       git commit -m "Side changes #2" &&
+       git tag C2 &&
 
        for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
        git update-index file &&
-       git commit -m "Side change #3" &&
+       git commit -m "Side changes #3 with \\n backslash-n in it." &&
 
        git checkout master &&
-       git diff-tree -p C1 | git apply --index &&
-       git commit -m "Master accepts moral equivalent of #1"
+       git diff-tree -p C2 | git apply --index &&
+       git commit -m "Master accepts moral equivalent of #2"
 
 '
 
@@ -37,7 +40,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" '
 
        git format-patch --stdout master..side >patch0 &&
        cnt=`grep "^From " patch0 | wc -l` &&
-       test "$cnt" = 3
+       test $cnt = 3
 
 '
 
@@ -46,7 +49,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" '
        git format-patch --stdout \
                --ignore-if-in-upstream master..side >patch1 &&
        cnt=`grep "^From " patch1 | wc -l` &&
-       test "$cnt" = 2
+       test $cnt = 2
 
 '
 
@@ -55,7 +58,7 @@ test_expect_success "format-patch result applies" '
        git checkout -b rebuild-0 master &&
        git am -3 patch0 &&
        cnt=`git rev-list master.. | wc -l` &&
-       test "$cnt" = 2
+       test $cnt = 2
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream result applies" '
@@ -63,7 +66,26 @@ test_expect_success "format-patch --ignore-if-in-upstream result applies" '
        git checkout -b rebuild-1 master &&
        git am -3 patch1 &&
        cnt=`git rev-list master.. | wc -l` &&
-       test "$cnt" = 2
+       test $cnt = 2
+'
+
+test_expect_success 'commit did not screw up the log message' '
+
+       git cat-file commit side | grep "^Side .* with .* backslash-n"
+
+'
+
+test_expect_success 'format-patch did not screw up the log message' '
+
+       grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
+       grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
+
+'
+
+test_expect_success 'replay did not screw up the log message' '
+
+       git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
+
 '
 
 test_done