summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5d3cb9f)
Test $archive_hash for undef early enough.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit (2.9~) unstable; urgency=low
dgit (2.9~) unstable; urgency=low
+ * Split brain mode: Fix --new. Closes:#842354.
+ return $dgitview unless defined $archive_hash;
+
printdebug "splitbrain_pseudomerge...\n";
my $i_arch_v = pseudomerge_version_check($clogp, $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...";
}
if (!defined $overwrite_version) {
progress "Checking that HEAD inciudes all changes in archive...";
}