aboutsummaryrefslogtreecommitdiff
path: root/t/t9101-git-svn-props.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-16 21:30:06 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-16 21:30:06 -0800
commitf1a82fe9a3de780fb2f1fe054d692294544f01e7 (patch)
treeb4114c8ec6552111b23f59df773bf37357a23861 /t/t9101-git-svn-props.sh
parent41a7aa588f449d3b139480b102f510abc5ef7f85 (diff)
parent78e694787cb89cd008e237b17cdc7f0fa5a15d22 (diff)
downloadgit-f1a82fe9a3de780fb2f1fe054d692294544f01e7.tar.gz
git-f1a82fe9a3de780fb2f1fe054d692294544f01e7.tar.xz
Merge branch 'maint'
* maint: Update draft release notes for 1.5.3.6 Fix per-directory exclude handing for "git add" core.excludesfile clean-up Fix t9101 test failure caused by Subversion "auto-props" git-send-email: add charset header if we add encoded 'From'
Diffstat (limited to 't/t9101-git-svn-props.sh')
-rwxr-xr-xt/t9101-git-svn-props.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 3c83127a0..d7a704754 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -48,7 +48,7 @@ EOF
printf "\r\n" > empty_crlf
a_empty_crlf=`git-hash-object -w empty_crlf`
- svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
+ svn import --no-auto-props -m 'import for git-svn' . "$svnrepo" >/dev/null
cd ..
rm -rf import