[PATCH 1/1] git-svn: ignore leading blank lines in svn:ignore

Michael Haggerty· Aug 7, 2009, 19:21 UTC · lore

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>
---
 git-svn.perl             |    2 ++
 t/t9101-git-svn-props.sh |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

Show changes to 2 files +6 −1

git-svn.perl, t/t9101-git-svn-props.sh

diff --git a/git-svn.perl b/git-svn.perl
index d075810..f1cc849 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 9da4178..929499e 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

-- 
1.6.4

Eric Wong· Aug 10, 2009, 09:38 UTC · re: Michael Haggerty · lore

Re: [PATCH 1/1] git-svn: ignore leading blank lines in svn:ignore

Michael Haggerty <mhagger@alum.mit.edu> wrote:

Show 9 quoted lines

> 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>

Thanks Michael,

Acked out and pushed out along with two of Adam's to git://yhbt.net/git-svn:

Adam Brewster (2):
      svn: Add && to t9107-git-svn-migrate.sh
      svn: Honor --prefix option in init without --stdlayout

Michael Haggerty (1):
      git-svn: ignore leading blank lines in svn:ignore

-- 
Eric Wong

patchgit-svn: ignore leading blank lines in svn:ignore