pseudomerge: When generating pseudomerge in quilt split brain mode due to --overwrite...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 1de40c1856cec8a1f67222903076b5993935eef2..bc4d7c3e55bb2f1f09b64b6c1dd1d86e42ca6f7a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2912,7 +2912,7 @@ sub splitbrain_pseudomerge ($$$$) {
        $clogp, $dgitview, $archive_hash, $i_arch_v,
        "dgit --quilt=$quilt_mode",
        (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
-Declare fast forward from $overwrite_version
+Declare fast forward from $i_arch_v->[0]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 END_MAKEFF
@@ -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 '../../../..';