chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain mode: Fix --new. Closes:#842354.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 7508fe15a2493295e01f0d3cc7587472cc51b2f1..6d9bacae4b32e9b1b01d55fe4a852f1311dd36d4 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2950,12
+2950,12
@@
sub splitbrain_pseudomerge ($$$$) {
# this: $dgitview'
#
# this: $dgitview'
#
+ 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...";
}