summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2013-03-20 09:47:57 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-20 10:10:28 -0700
commit8be412a723459feb9f521062e2919f8f6e8389d3 (patch)
treeb13bfdd2aaa525ef6e280d7f88776ef97df12f49
parententry: fix filter lookup (diff)
downloadtgif-8be412a723459feb9f521062e2919f8f6e8389d3.tar.xz
t2003: work around path mangling issue on Windows
MSYS bash considers the part "/g" in the sed expression "s/./=/g" as an absolute path after an assignment, and mangles it to a C:/something string. Do not attract bash's attention by avoiding the equals sign. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t2003-checkout-cache-mkdir.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2003-checkout-cache-mkdir.sh b/t/t2003-checkout-cache-mkdir.sh
index 4c97468b82..ff163cf675 100755
--- a/t/t2003-checkout-cache-mkdir.sh
+++ b/t/t2003-checkout-cache-mkdir.sh
@@ -94,14 +94,14 @@ test_expect_success 'apply filter from working tree .gitattributes with --prefix
rm -fr path0 path1 path2 tmp* &&
mkdir path1 &&
mkdir tmp &&
- git config filter.replace-all.smudge "sed -e s/./=/g" &&
+ git config filter.replace-all.smudge "sed -e s/./,/g" &&
git config filter.replace-all.clean cat &&
git config filter.replace-all.required true &&
echo "file1 filter=replace-all" >path1/.gitattributes &&
git checkout-index --prefix=tmp/ -f -a &&
echo frotz >expected &&
test_cmp expected tmp/path0 &&
- echo ====== >expected &&
+ echo ,,,,,, >expected &&
test_cmp expected tmp/path1/file1
'