mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'pb/blame-funcname-range-userdiff'
Test fix. * pb/blame-funcname-range-userdiff: annotate-tests: quote variable expansions containing path names
This commit is contained in:
commit
61b159e219
|
@ -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"
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue