Merge branch 'jh/trace2-pretty-output'

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index c973278300a5c911845016ef1e23144f51ebcd7d..df34c994d2f125e91db663b78412e1e04f637cc8 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -158,7 +158,6 @@ test_expect_success 'submodule update --init from and of subdirectory' '
        test_i18ncmp expect2 actual2
 '
 
-apos="'";
 test_expect_success 'submodule update does not fetch already present commits' '
        (cd submodule &&
          echo line3 >> file &&
@@ -168,7 +167,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
        ) &&
        (cd super/submodule &&
          head=$(git rev-parse --verify HEAD) &&
-         echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
+         echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected &&
          git reset --hard HEAD~1
        ) &&
        (cd super &&