Merge branch 'jk/parseopt-usage-msg-opt' into maint

diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 217dd79b2e4b5c02ee27f3b913c37c489ec585f2..49f548cdb93d53d88723adcd1f414a4db4c14a73 100755 (executable)
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -73,17 +73,17 @@ do_tests () {
                run git format-patch --stdout --ignore-if-in-upstream master
        "
 
-       test_expect_success $pr 'detect upstream patch' "
+       test_expect_success $pr 'detect upstream patch' '
                git checkout -q master &&
                scramble file &&
                git add file &&
-               git commit -q -m 'change big file again' &&
+               git commit -q -m "change big file again" &&
                git checkout -q other^{} &&
                git rebase master &&
-               test_must_fail test -n \"\$(git rev-list master...HEAD~)\"
-       "
+               test_must_fail test -n "$(git rev-list master...HEAD~)"
+       '
 
-       test_expect_success $pr 'do not drop patch' "
+       test_expect_success $pr 'do not drop patch' '
                git branch -f squashed master &&
                git checkout -q -f squashed &&
                git reset -q --soft HEAD~2 &&
@@ -91,7 +91,7 @@ do_tests () {
                git checkout -q other^{} &&
                test_must_fail git rebase squashed &&
                rm -rf .git/rebase-apply
-       "
+       '
 }
 
 do_tests 500