[PATCH 3/4] contrib/git-svn: ensure repo-config returns a value before using it

Subsystems: the rest

DORMANTno replies

3 messages, 1 author, 2016-06-15 · open the first message on its own page

[PATCH 3/4] contrib/git-svn: ensure repo-config returns a value before using it

From: Eric Wong <hidden>
Date: 2016-06-15 22:42:23

fetching from repos without an authors-file defined was broken.

Signed-off-by: Eric Wong <redacted>

---

 contrib/git-svn/git-svn.perl |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

029626bf987cff7ba42d8158c687cf4902765968
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index edfb19c..e7fff46 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -77,10 +77,13 @@ foreach my $o (keys %opts) {
 	$arg .= ' --bool' if ($o !~ /=[sfi]$/);
 	$arg .= " svn.$key"; # $key only matches [a-z\-], always shell-safe
 	if (ref $v eq 'ARRAY') {
-		chomp(@$v = `$arg`);
+		chomp(my @tmp = `$arg`);
+		@$v = @tmp if @tmp;
 	} else {
-		chomp($$v = `$arg`);
-		$$v = 0 if $$v eq 'false';
+		chomp(my $tmp = `$arg`);
+		if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
+			$$v = $tmp;
+		}
 	}
 }
 
-- 
1.3.0.rc1.g595e

[PATCH 4/4] contrib/git-svn: make sure our git-svn is up-to-date for test

From: Eric Wong <hidden>
Date: 2016-06-15 22:42:23

Bugs like the last one could've been avoided if it weren't for
this...

Signed-off-by: Eric Wong <redacted>

---

 contrib/git-svn/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

d3ce1325c4933cd0e5f8f9810b2ffc33ddf45aac
diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile
index d7f1643..acedf73 100644
--- a/contrib/git-svn/Makefile
+++ b/contrib/git-svn/Makefile
@@ -28,7 +28,7 @@ git-svn.xml : git-svn.txt
 git-svn.html : git-svn.txt
 	asciidoc -b xhtml11 -d manpage \
 		-f ../../Documentation/asciidoc.conf $<
-test:
+test: git-svn
 	cd t && $(SHELL) ./t0000-contrib-git-svn.sh
 
 clean:
-- 
1.3.0.rc1.g595e

Re: [PATCH 3/4] contrib/git-svn: ensure repo-config returns a value before using it

From: Eric Wong <hidden>
Date: 2016-06-15 22:42:23

Subject: Re: [PATCH 3/4] contrib/git-svn: ensure repo-config returns a value before using it
                    ^ oops, disregard that, these should've been 1/2 and 2/2

-- 
Eric Wong
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help