diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 00:56:16 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 01:44:23 +0100 |
commit | 7c135b780c03d0d5abbcf7fec65062e84e68c551 (patch) | |
tree | de4cbf7992d45e89526f7fc5d6f8ff64b02b0740 /dgit | |
parent | 1a5d5c297c2532d445e9b5ad1cfc94cafd1ea978 (diff) |
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>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 '../../../..'; |