Merge branch 'jc/autogc' into js/rebase-i

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index df969bb69ce148f26709691fe846def7f960d39d..0a6fe53375bb26e5c3a69d503f6f13833a2020fa 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -10,12 +10,15 @@ 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 &&
+       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 &&