Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh
index f603c1b1336c4a00889177376d9b51077c9cc2ac..e758e634a34762c6a2e085e0f6ea8fc5cc00af5e 100755 (executable)
--- a/t/t4252-am-options.sh
+++ b/t/t4252-am-options.sh
@@ -59,7 +59,7 @@ test_expect_success 'interrupted am --directory="frotz nitfol"' '
 '
 
 test_expect_success 'apply to a funny path' '
-       with_sq="with'\''sq"
+       with_sq="with'\''sq" &&
        rm -fr .git/rebase-apply &&
        git reset --hard initial &&
        git am --directory="$with_sq" "$tm"/am-test-5-2 &&