dgit: Do not nedlessly re-fetch the rewrite map.

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

diff --git a/debian/changelog b/debian/changelog
index 095e9774c7a2148e1270edf9e6d2210f58da4a6b..8fa1f1526a87baf011e21cb3c5dfb470a71121de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (3.1~) unstable; urgency=medium
 
-  * 
+  Bugfixes:
+  * dgit: Do not nedlessly re-fetch the rewrite map.
 
  --
 

diff --git a/dgit b/dgit
index 824e9d1b3ccaaf010c25e4102bf6d3e2e9d04655..d3673c21ad47024a7654cefa0b4d81b076eea308 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2843,8 +2843,10 @@ END
     };
 
     if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
-       my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
-       $mapref = $lrf.'/'.$rewritemap;
+       if (!defined $mapref) {
+           my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
+           $mapref = $lrf.'/'.$rewritemap;
+       }
        my $rewritemapdata = git_cat_file $mapref.':map';
        if (defined $rewritemapdata
            && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {