summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdgit9
1 files changed, 8 insertions, 1 deletions
diff --git a/dgit b/dgit
index 4b4380b..4d31cd6 100755
--- a/dgit
+++ b/dgit
@@ -1988,10 +1988,14 @@ END
my $format = getfield $dsc, 'Format';
printdebug "format $format\n";
+
if (madformat($format)) {
# user might have not used dgit build, so maybe do this now:
commit_quilty_patch();
}
+
+ die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;
+
check_not_dirty();
changedir $ud;
progress "checking that $dscfn corresponds to HEAD";
@@ -2628,7 +2632,6 @@ END
runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
$dgitview;
- die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)';
changedir '.git/dgit/unpack/work';
}
@@ -2865,6 +2868,8 @@ sub build_maybe_quilt_fixup () {
quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
}
+ die 'bug' if $split_brain && !$need_split_build_invocation;
+
changedir '../../../..';
runcmd_ordryrun_local
@git, qw(pull --ff-only -q .git/dgit/unpack/work master);
@@ -3773,6 +3778,8 @@ if (!defined $quilt_mode) {
$quilt_mode = $1;
}
+$need_split_build_invocation ||= quiltmode_splitbrain();
+
if (!defined $cleanmode) {
local $access_forpush;
$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');