From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 00:18:03 +0000 (+0100)
Subject: dgit: return $r1authline from import_tarball_commits
X-Git-Tag: archive/debian/9.0~44
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ceccb3516b453ab1c21f11d1907382e7be45c134

dgit: return $r1authline from import_tarball_commits

No functional change for existing caller, which just discards it.

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

diff --git a/dgit b/dgit
index 73b88ad5..c5ff37b5 100755
--- a/dgit
+++ b/dgit
@@ -2443,9 +2443,10 @@ sub import_tarball_commits ($$) {
     $changes =~ s/^\n//; # Changes: \n
     my $cversion = getfield $clogp, 'Version';
 
+    my $r1authline;
     if (@$tartrees) {
 	$r1clogp //= $clogp; # maybe there's only one entry;
-	my $r1authline = clogp_authline $r1clogp;
+        $r1authline = clogp_authline $r1clogp;
 	# Strictly, r1authline might now be wrong if it's going to be
 	# unused because !$any_orig.  Whatever.
 
@@ -2476,7 +2477,7 @@ END_T
 	}
     }
 
-    return ($authline, $clogp, $changes);
+    return ($authline, $r1authline, $clogp, $changes);
 }
 
 sub generate_commits_from_dsc () {
@@ -2569,7 +2570,7 @@ sub generate_commits_from_dsc () {
 	$dappliedtree = git_add_write_tree();
     }
 
-    my ($authline, $clogp, $changes) =
+    my ($authline, $r1authline, $clogp, $changes) =
 	import_tarball_commits(\@tartrees, $upstreamv);
 
     my $cversion = getfield $clogp, 'Version';