summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdgit4
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...";
}