summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-30 01:18:03 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-30 21:11:17 +0100
commitceccb3516b453ab1c21f11d1907382e7be45c134 (patch)
tree3f7b86de491917b4f08c5b051140c4c9654ac50f /dgit
parent13aca4fc3c36a5ce46e1a7d9ac3534ef247bee63 (diff)
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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit7
1 files changed, 4 insertions, 3 deletions
diff --git a/dgit b/dgit
index 73b88ad..c5ff37b 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';