Split brain mode: Fix --new. Closes:#842354.

Test $archive_hash for undef early enough.

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

diff --git a/debian/changelog b/debian/changelog
index c7e7cc6b5f9194eb0b81ead2bdc1554878222c2a..5c72474e2f5f79a1ffa5a70c8726ce17ed3dc951 100644 (file)
--- 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 7508fe15a2493295e01f0d3cc7587472cc51b2f1..6d9bacae4b32e9b1b01d55fe4a852f1311dd36d4 100755 (executable)
--- 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...";
     }