From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 17 Oct 2016 23:56:16 +0000 (+0100)
Subject: pseudomerge: Abolish confusing $dgitview variable
X-Git-Tag: debian/2.3~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7c135b780c03d0d5abbcf7fec65062e84e68c551;p=dgit.git

pseudomerge: Abolish confusing $dgitview variable

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>
---

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 '../../../..';