dgit: push_mktags: Rename variable $dtxinfo

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 84fcc3f20f34b988d3d49e4ab5c2bcf48dffc7ed..de53faa381c8a2574bbbde96f332d19a6218f2c1 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -82,7 +82,7 @@ our $quilt_mode;
 our $quilt_upstream_commitish;
 our $quilt_upstream_commitish_used;
 our $quilt_upstream_commitish_message;
-our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball)?';
+our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?';
 our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
 our $splitview_mode;
 our $splitview_modes_re = qr{auto|always|never};
@@ -4361,7 +4361,7 @@ sub push_mktags ($$ $$ $) {
     # We make the git tag by hand because (a) that makes it easier
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
-    my $delibs = join(" ", "",@deliberatelies);
+    my $dtxinfo = join(" ", "",@deliberatelies);
 
     my $mktag = sub {
        my ($tw) = @_;
@@ -4383,7 +4383,7 @@ END
 ENDT
                or confess "$!";
            print TO <<END or confess "$!";
-[dgit distro=$declaredistro$delibs]
+[dgit distro=$declaredistro$dtxinfo]
 END
            foreach my $ref (sort keys %previously) {
                print TO <<END or confess "$!";
@@ -7716,6 +7716,7 @@ sub parseopts_late_defaults () {
            or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
        $quilt_mode = $1;
     }
+    $quilt_mode =~ s/^(baredebian)\+git$/$1/;
 
     foreach my $moc (@modeopt_cfgs) {
        local $access_forpush;