From c4a96d7a9ed9f83abed11a84f7fe068e27dee2b1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 21 Jun 2018 01:20:01 +0100
Subject: 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>
---
 dgit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dgit')

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);
-- 
cgit v1.2.3