test suite: baredebian: move setting of $quiltmode to lib

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 33370619cd2f12d277e7475a8fd9154049c47ede..c5ff37b53406b91740f39115357a956a0eef4b7e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2367,6 +2367,7 @@ sub import_tarball_tartrees ($$) {
             Sort => (!$orig_f_part         ? 2 :
                     $orig_f_part =~ m/-/g ? 1 :
                                             0),
+            OrigPart => $orig_f_part, # 'orig', 'orig-XXX', or undef 
             F => $f,
             Tree => $tree,
         };
@@ -2442,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.
 
@@ -2475,7 +2477,7 @@ END_T
        }
     }
 
-    return ($authline, $clogp, $changes);
+    return ($authline, $r1authline, $clogp, $changes);
 }
 
 sub generate_commits_from_dsc () {
@@ -2568,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';