X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=3b847d7e6c649cd60d4502714c57d0eaa4f831dd;hb=7c135b780c03d0d5abbcf7fec65062e84e68c551;hp=1de40c1856cec8a1f67222903076b5993935eef2;hpb=cb141c47ad54318dd4321e9f410aee5f8373c245;p=dgit.git

diff --git a/dgit b/dgit
index 1de40c18..3b847d7e 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 '../../../..';