X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=bca6745cf62d8b6b0c41df8cb3dab4493de0bcf2;hp=6fb0711b58734c969b2cfddc61f72ab0d8fd1d7f;hb=077ca64d7cfb771c9f4dd278a9b9e2fdb6a4f729;hpb=41acb4ec92f077c3126a51621937f50000485d92

diff --git a/dgit b/dgit
index 6fb0711b..bca6745c 100755
--- a/dgit
+++ b/dgit
@@ -1563,8 +1563,6 @@ END
     my @output = ($rawimport_mergeinput);
     progress "synthesised git commit from .dsc $cversion";
     if ($lastpush_mergeinput) {
-	my $lastpush_hash = $lastpush_mergeinput->{Commit};
-	runcmd @git, qw(reset -q --hard), $lastpush_hash;
 	my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
 	my $oversion = getfield $oldclogp, 'Version';
 	my $vcmp =
@@ -2129,10 +2127,7 @@ END
     if (defined $skew_warning_vsn) {
 	mkpath '.git/dgit';
 	printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
-	my $clogf = ".git/dgit/changelog.tmp";
-	runcmd shell_cmd "exec >$clogf",
-	    @git, qw(cat-file blob), "$hash:debian/changelog";
-	my $gotclogp = parsechangelog("-l$clogf");
+	my $gotclogp = commit_getclogp($hash);
 	my $got_vsn = getfield $gotclogp, 'Version';
 	printdebug "SKEW CHECK GOT $got_vsn\n";
 	if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
@@ -2402,6 +2397,7 @@ sub push_tagwants ($$$$) {
 	$tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
 	$tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
     }
+    printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
     return @tagwants;
 }
 
@@ -2695,11 +2691,6 @@ END
 
     my @pushrefs = $forceflag.$dgithead.":".rrref();
     foreach my $tw (@tagwants) {
-	my $view = $tw->{View};
-	next unless $view eq 'dgit'
-	    or any { $_ eq $view } access_cfg_tagformats();
-	    # ^ $view is "dgit" or "maint" so this looks for "maint"
-	    # in archive supported tagformats.
 	push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
     }