test suite: downstream-gitless: Run t-ok

[dgit.git] / dgit

diff --git a/dgit b/dgit
index ee1101da23a4521f3d9d5ac33e59b0b2c37cd248..35a2b37c6c37302862fa79935b470d8844fcc650 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -78,7 +78,7 @@ our $patches_applied_dirtily = 00;
 our $tagformat_want;
 our $tagformat;
 our $tagformatfn;
-our $chase_dsc_distro=1; #xxx configurable
+our $chase_dsc_distro=1;
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
@@ -2823,8 +2823,12 @@ END
        return $lrf;
     };
 
-    if (parse_cfg_bool 'rewrite-map-enable', 'true',
-           access_cfg('rewrite-map-enable', 'RETURN-UNDEF')) {
+    my $rewrite_enable = do {
+       local $idistro = $dsc_distro;
+       access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
+    };
+
+    if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
        my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
        $mapref = $lrf.'/'.$rewritemap;
        my $rewritemapdata = git_cat_file $mapref.':map';
@@ -6277,6 +6281,9 @@ sub parseopts () {
            } elsif (m/^--no-rm-on-error$/s) {
                push @ropts, $_;
                $rmonerror = 0;
+           } elsif (m/^--no-chase-dsc-distro$/s) {
+               push @ropts, $_;
+               $chase_dsc_distro = 0;
            } elsif (m/^--overwrite$/s) {
                push @ropts, $_;
                $overwrite_version = '';