From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Oct 2018 00:13:57 +0000 (+0100)
Subject: dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc
X-Git-Tag: archive/debian/7.0_pre1~32
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6f15f6d53ce1b671a23aea940ca4a0213f6aa6f4

dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc

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

diff --git a/dgit b/dgit
index a253b2d4..9fd01b0d 100755
--- a/dgit
+++ b/dgit
@@ -4096,18 +4096,19 @@ END
 	finish -1;
     }
 
+    my $arch_v = $i_arch_v->[0];
     my $r = pseudomerge_make_commit
 	$clogp, $dgitview, $archive_hash, $i_arch_v,
 	"dgit --quilt=$quilt_mode",
 	(defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
-Declare fast forward from $i_arch_v->[0]
+Declare fast forward from $arch_v
 END_OVERWR
-Make fast forward from $i_arch_v->[0]
+Make fast forward from $arch_v
 END_MAKEFF
 
     maybe_split_brain_save $maintview, $r, "pseudomerge";
 
-    progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
+    progress "Made pseudo-merge of $arch_v into dgit view.";
     return $r;
 }