summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-21 01:20:01 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-21 01:32:31 +0100
commitc4a96d7a9ed9f83abed11a84f7fe068e27dee2b1 (patch)
treee2180b460ff8e33b7470f1ef57e4d6ae638e3246 /dgit
parentc0df25cd65b0172d5130e01a73aa610c3b0dd105 (diff)
dgit: --overwrite now no longer crashes if there is no $archive_hash
Ie there is nothing to overwrite (eg, when used with --new). Instead, it is simply ignored, as it is ignored in situations where the push is fast forward. Closes:#863576. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit3
1 files changed, 2 insertions, 1 deletions
diff --git a/dgit b/dgit
index 3409e18..5a6b2b6 100755
--- a/dgit
+++ b/dgit
@@ -4301,7 +4301,8 @@ END
}
}
- if (defined $overwrite_version && !defined $maintviewhead) {
+ if (defined $overwrite_version && !defined $maintviewhead
+ && $archive_hash) {
$dgithead = plain_overwrite_pseudomerge($clogp,
$dgithead,
$archive_hash);