diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-17 05:30:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-17 05:30:06 (GMT) |
| commit | f1a82fe9a3de780fb2f1fe054d692294544f01e7 (patch) | |
| tree | b4114c8ec6552111b23f59df773bf37357a23861 /t | |
| parent | 41a7aa588f449d3b139480b102f510abc5ef7f85 (diff) | |
| parent | 78e694787cb89cd008e237b17cdc7f0fa5a15d22 (diff) | |
| download | git-f1a82fe9a3de780fb2f1fe054d692294544f01e7.zip git-f1a82fe9a3de780fb2f1fe054d692294544f01e7.tar.gz git-f1a82fe9a3de780fb2f1fe054d692294544f01e7.tar.bz2 | |
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')
| -rwxr-xr-x | t/t9101-git-svn-props.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index 3c83127..d7a7047 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 |