summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 17:42:40 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 17:42:44 +0000
commit41206be38908e773a8dab752e857f2935924571e (patch)
tree4841297fc2c3d1eebbcf4939f0a5a258b9621ce2
parent13169f79a5d978b57a36ecbda281f0ab60000be6 (diff)
dgit: Do not nedlessly re-fetch the rewrite map.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog3
-rwxr-xr-xdgit6
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 095e977..8fa1f15 100644
--- 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 824e9d1..d3673c2 100755
--- 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) {