From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Jun 2019 19:11:03 +0000 (+0100)
Subject: dgit: Fix --dgit-view-save option
X-Git-Tag: archive/debian/9.0~113
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=42a859777ce9d299137917c7d8f1cff7c074fa71;p=dgit.git

dgit: Fix --dgit-view-save option

This was supposed to be an alias for --save-dgit-view but didn't work
because || forced scalar context.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index d720f5af..60d7f1fb 100755
--- a/dgit
+++ b/dgit
@@ -7414,10 +7414,10 @@ sub parseopts () {
 	    } elsif (m/^--delayed=(\d+)$/s) {
 		push @ropts, $_;
 		push @dput, $_;
-	    } elsif (my ($k,$v) =
-		     m/^--save-(dgit-view)=(.+)$/s ||
+	    } elsif (m/^--save-(dgit-view)=(.+)$/s ||
 		     m/^--(dgit-view)-save=(.+)$/s
 		     ) {
+		my ($k,$v) = ($1,$2);
 		push @ropts, $_;
 		$v =~ s#^(?!refs/)#refs/heads/#;
 		$internal_object_save{$k} = $v;