X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=bc4d7c3e55bb2f1f09b64b6c1dd1d86e42ca6f7a;hb=12da50e85e2fe58f537d8eb1c3b06f1377e373c9;hp=53f47136efd8c4424cfb236f006d996e31dbc491;hpb=ef933efbf46dce39eafd0a4bda51a180ed0c541e;p=dgit.git

diff --git a/dgit b/dgit
index 53f47136..bc4d7c3e 100755
--- 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
@@ -2928,16 +2928,6 @@ sub plain_overwrite_pseudomerge ($$$) {
 
     my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
 
-    my @tagformats = access_cfg_tagformats();
-    my @t_overwr =
-	map { $_->($i_arch_v->[0], access_basedistro) }
-	(grep { m/^(?:old|hist)$/ } @tagformats)
-	? \&debiantags : \&debiantag_new;
-    my $i_overwr = infopair_lrf_tag_lookup \@t_overwr, "previous version tag";
-    my $i_archive = [ $archive_hash, "current archive contents" ];
-
-    infopair_cond_equal($i_overwr, $i_archive);
-
     return $head if is_fast_fwd $archive_hash, $head;
 
     my $m = "Declare fast forward from $i_arch_v->[0]";
@@ -3162,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 '../../../..';