summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdgit7
1 files changed, 4 insertions, 3 deletions
diff --git a/dgit b/dgit
index 1de40c1..3b847d7 100755
--- a/dgit
+++ b/dgit
@@ -3152,14 +3152,15 @@ END
$upstreamversion =~ s/-[^-]*$//;
changedir $ud;
quilt_make_fake_dsc($upstreamversion);
- my ($dgitview, $cachekey) =
+ my $cachekey;
+ ($dgithead, $cachekey) =
quilt_check_splitbrain_cache($actualhead, $upstreamversion);
- $dgitview or fail
+ $dgithead or fail
"--quilt=$quilt_mode but no cached dgit view:
perhaps tree changed since dgit build[-source] ?";
$split_brain = 1;
$dgithead = splitbrain_pseudomerge($clogp,
- $actualhead, $dgitview,
+ $actualhead, $dgithead,
$archive_hash);
$maintviewhead = $actualhead;
changedir '../../../..';