X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dgit;h=6d9bacae4b32e9b1b01d55fe4a852f1311dd36d4;hb=7c46c74441fe07ede753915a7e9e3b0c135a051f;hp=7508fe15a2493295e01f0d3cc7587472cc51b2f1;hpb=5d3cb9fbb054b800acbf97bdb3ef547a98982e40;p=dgit.git diff --git a/dgit b/dgit index 7508fe15..6d9bacae 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..."; }