pseudomerge: Abolish confusing $dgitview variable

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 1de40c1856cec8a1f67222903076b5993935eef2..3b847d7e6c649cd60d4502714c57d0eaa4f831dd 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3152,14 +3152,15 @@ END
            $upstreamversion =~ s/-[^-]*$//;
            changedir $ud;
            quilt_make_fake_dsc($upstreamversion);
            $upstreamversion =~ s/-[^-]*$//;
            changedir $ud;
            quilt_make_fake_dsc($upstreamversion);

-           my ($dgitview, $cachekey) =
+           my $cachekey;
+           ($dgithead, $cachekey) =

                quilt_check_splitbrain_cache($actualhead, $upstreamversion);
                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,
  "--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 '../../../..';
                                               $archive_hash);
            $maintviewhead = $actualhead;
            changedir '../../../..';