From 7c46c74441fe07ede753915a7e9e3b0c135a051f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Oct 2016 14:36:04 +0000
Subject: Split brain mode: Fix --new.  Closes:#842354.

Test $archive_hash for undef early enough.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 2 +-
 dgit             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7e7cc6..5c72474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dgit (2.9~) unstable; urgency=low
 
-  * 
+  * Split brain mode: Fix --new.  Closes:#842354.
 
  --
 
diff --git a/dgit b/dgit
index 7508fe1..6d9baca 100755
--- a/dgit
+++ b/dgit
@@ -2950,12 +2950,12 @@ sub splitbrain_pseudomerge ($$$$) {
     #   this:                                   $dgitview'
     #
 
+    return $dgitview unless defined $archive_hash;
+
     printdebug "splitbrain_pseudomerge...\n";
 
     my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
 
-    return $dgitview unless defined $archive_hash;
-
     if (!defined $overwrite_version) {
 	progress "Checking that HEAD inciudes all changes in archive...";
     }
-- 
cgit v1.2.3