summaryrefslogtreecommitdiff
path: root/t/t9101-git-svn-props.sh
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2009-08-07 21:21:21 +0200
committerEric Wong <normalperson@yhbt.net>2009-08-10 02:35:55 -0700
commita7d72544b112f093b6189a86d05b198b2be73828 (patch)
treeb7e0e2fbfc87d053f190a953df4da1d44c40ce80 /t/t9101-git-svn-props.sh
parent63de84ad60984105b1cd60fb888968b352539313 (diff)
downloadgit-a7d72544b112f093b6189a86d05b198b2be73828.tar.gz
git-svn: ignore leading blank lines in svn:ignore
Subversion ignores all blank lines in svn:ignore properties. The old git-svn code ignored blank lines everywhere except for the first line of the svn:ignore property. This patch makes the "git svn show-ignore" and "git svn create-ignore" commands ignore leading blank lines, too. Also include leading blank lines in the test suite. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9101-git-svn-props.sh')
-rwxr-xr-xt/t9101-git-svn-props.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 9da4178c94..929499e996 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -142,7 +142,9 @@ test_expect_success 'test show-ignore' "
touch deeply/nested/directory/.keep &&
svn_cmd add deeply &&
svn_cmd up &&
- svn_cmd propset -R svn:ignore 'no-such-file*' .
+ svn_cmd propset -R svn:ignore '
+no-such-file*
+' .
svn_cmd commit -m 'propset svn:ignore'
cd .. &&
git svn show-ignore > show-ignore.got &&
@@ -171,6 +173,7 @@ test_expect_success 'test create-ignore' "
"
cat >prop.expect <<\EOF
+
no-such-file*
EOF