Merge branch 'pb/blame-funcname-range-userdiff'

Test fix.

* pb/blame-funcname-range-userdiff:
  annotate-tests: quote variable expansions containing path names

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index ee5d2d4cf81972bfc82c9d74af7e7b5341f5d24b..29ce89090d8554a1766c31e9b90cbb387d45c6f7 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -483,12 +483,12 @@ test_expect_success 'setup -L :funcname with userdiff driver' '
        echo "fortran-* diff=fortran" >.gitattributes &&
        fortran_file=fortran-external-function &&
        orig_file="$TEST_DIRECTORY/t4018/$fortran_file" &&
-       cp $orig_file . &&
-       git add $fortran_file &&
+       cp "$orig_file" . &&
+       git add "$fortran_file" &&
        GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
        git commit -m "add fortran file" &&
-       sed -e "s/ChangeMe/IWasChanged/" <"$orig_file" >$fortran_file &&
-       git add $fortran_file &&
+       sed -e "s/ChangeMe/IWasChanged/" <"$orig_file" >"$fortran_file" &&
+       git add "$fortran_file" &&
        GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
        git commit -m "change fortran file"
 '