aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-11-16 14:25:10 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-16 16:55:46 -0800
commit2587d6796605273de3a5ec7ba44ee1c1ac2b9302 (patch)
tree1b993f0b41eb7228d6357d0bca4dce32d560c9f6 /t
parent8291db6f584076b60efa47d72c604b1949508ef8 (diff)
downloadgit-2587d6796605273de3a5ec7ba44ee1c1ac2b9302.tar.gz
git-2587d6796605273de3a5ec7ba44ee1c1ac2b9302.tar.xz
Fix t9101 test failure caused by Subversion "auto-props"
If a user has an "auto-prop" in his/her ~/.subversion/config file for automatically setting the svn:keyword Id property on all ".c" files (a reasonably common configuration in the Subversion world) then one of the "svn propset" operations in the very first test would become a no-op, which in turn would make the next commit a no-op. This then caused the 25th test ('test propget') to fail because it expects a certain number of commits to have taken place but the actual number of commits was off by one. Björn Steinbrink identified the "auto-prop" feature as the cause of the failure. This patch avoids it by passing the "--no-auto-prop" flag to "svn import" when setting up the test repository, thus ensuring that the "svn propset" operation is no longer a no-op, regardless of the users' settings in their config. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-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 622ea1c0d..02c41697d 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