Skip to content

Commit 2587d67

Browse files
wincentgitster
authored andcommitted
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>
1 parent 8291db6 commit 2587d67

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t9101-git-svn-props.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ EOF
4848
printf "\r\n" > empty_crlf
4949
a_empty_crlf=`git-hash-object -w empty_crlf`
5050

51-
svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
51+
svn import --no-auto-props -m 'import for git-svn' . "$svnrepo" >/dev/null
5252
cd ..
5353

5454
rm -rf import

0 commit comments

Comments
 (0)