diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 14:36:04 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 14:36:27 +0000 |
commit | 7c46c74441fe07ede753915a7e9e3b0c135a051f (patch) | |
tree | 09a9fdac699e5c66d6446afccd0c70437f786849 /dgit | |
parent | 5d3cb9fbb054b800acbf97bdb3ef547a98982e40 (diff) |
Split brain mode: Fix --new. Closes:#842354.
Test $archive_hash for undef early enough.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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..."; } |