chiark / gitweb /
pseudomerge: Abolish confusing $dgitview variable
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 17 Oct 2016 23:56:16 +0000 (00:56 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:44:23 +0000 (01:44 +0100)
This seems mostly to have existed to avoid writing `my $cachekey'
separately.  It has no separate function from $dgithead AFAICT.
Abolish it.  No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index 1de40c1..3b847d7 100755 (executable)
--- 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 '../../../..';