diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2009-08-07 21:21:21 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-08-10 02:35:55 -0700 |
| commit | a7d72544b112f093b6189a86d05b198b2be73828 (patch) | |
| tree | b7e0e2fbfc87d053f190a953df4da1d44c40ce80 | |
| parent | 63de84ad60984105b1cd60fb888968b352539313 (diff) | |
| download | git-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>
| -rwxr-xr-x | git-svn.perl | 2 | ||||
| -rwxr-xr-x | t/t9101-git-svn-props.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index fa8583963b..b0bfb74792 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -764,6 +764,7 @@ sub cmd_show_ignore { print STDOUT "\n# $path\n"; my $s = $props->{'svn:ignore'} or return; $s =~ s/[\r\n]+/\n/g; + $s =~ s/^\n+//; chomp $s; $s =~ s#^#$path#gm; print STDOUT "$s\n"; @@ -801,6 +802,7 @@ sub cmd_create_ignore { open(GITIGNORE, '>', $ignore) or fatal("Failed to open `$ignore' for writing: $!"); $s =~ s/[\r\n]+/\n/g; + $s =~ s/^\n+//; chomp $s; # Prefix all patterns so that the ignore doesn't apply # to sub-directories. 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 |