diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | 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. -- @@ -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..."; } |