X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=e8b6c3004a7cd299b8647faec2fbb02e2831ac46;hp=0bf0585bd78c379c973276acb1681b5fcc37f114;hb=e9b693fd8f254631be0e7046c4f3921d2d8676fd;hpb=fd0b402409d2f2b04c56bf596d9c387f8cc748f7

diff --git a/dgit b/dgit
index 0bf0585b..e8b6c300 100755
--- a/dgit
+++ b/dgit
@@ -49,6 +49,7 @@ our (@git) = qw(git);
 our (@dget) = qw(dget);
 our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
+our (@gpg) = qw(gpg);
 our (@sbuild) = qw(sbuild -A);
 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
@@ -59,6 +60,7 @@ our (@changesopts) = ('');
 our %opts_opt_map = ('dget' => \@dget,
 		     'dput' => \@dput,
 		     'debsign' => \@debsign,
+                     'gpg' => \@gpg,
                      'sbuild' => \@sbuild,
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
@@ -562,6 +564,18 @@ sub make_commit ($) {
     return cmdoutput @git, qw(hash-object -w -t commit), $file;
 }
 
+sub clogp_authline ($) {
+    my ($clogp) = @_;
+    my $author = getfield $clogp, 'Maintainer';
+    $author =~ s#,.*##ms;
+    my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
+    my $authline = "$author $date";
+    $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
+	fail "unexpected commit author line format \`$authline'".
+	" (was generated from changelog Maintainer field)";
+    return $authline;
+}
+
 sub generate_commit_from_dsc () {
     prep_ud();
     chdir $ud or die $!;
@@ -582,13 +596,7 @@ sub generate_commit_from_dsc () {
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
     my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
-    my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
-    my $author = getfield $clogp, 'Maintainer';
-    $author =~ s#,.*##ms;
-    my $authline = "$author $date";
-    $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
-	fail "unexpected commit author line format \`$authline'".
-	    " (was generated from changelog Maintainer field)";
+    my $authline = clogp_authline $clogp;
     my $changes = getfield $clogp, 'Changes';
     open C, ">../commit.tmp" or die $!;
     print C <<END or die $!;
@@ -962,6 +970,43 @@ sub dopush () {
     }
     my $tag = debiantag($dversion);
     runcmd @git, qw(check-ref-format), $tag;
+
+    # We make the git tag by hand because (a) that makes it easier
+    # to control the "tagger" (b) we can do remote signing
+    my $authline = clogp_authline $clogp;
+    my $tfn = sub { ".git/dgit/tag$_[0]"; };
+    open TO, '>', $tfn->('.tmp') or die $!;
+    print TO <<END or die $!;
+object $head
+type commit
+tag $tag
+tagger $authline
+
+$package release $dversion for $csuite [dgit]
+END
+    close TO or die $!;
+
+    my $tagobjfn = $tfn->('.tmp');
+    if ($sign) {
+	if (!defined $keyid) {
+	    $keyid = access_cfg('keyid','RETURN-UNDEF');
+	}
+	unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
+	my @sign_cmd = (@gpg, qw(--detach-sign --armor));
+	push @sign_cmd, qw(-u),$keyid if defined $keyid;
+	push @sign_cmd, $tfn->('.tmp');
+	runcmd_ordryrun @sign_cmd;
+	if (!$dryrun) {
+	    $tagobjfn = $tfn->('.signed.tmp');
+	    runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
+	        $tfn->('.tmp'), $tfn->('.tmp.asc');
+	}
+    }
+    my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
+    runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
+    runcmd_ordryrun @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
+    runcmd_ordryrun @git, qw(tag -v --), $tag;
+
     if (!check_for_git()) {
 	create_remote_git_repo();
     }
@@ -972,19 +1017,8 @@ sub dopush () {
     } else {
 	print "[new .dsc left in $dscfn.tmp]\n";
     }
-    if ($sign) {
-	if (!defined $keyid) {
-	    $keyid = access_cfg('keyid','RETURN-UNDEF');
-	}
-	my @tag_cmd = (@git, qw(tag -a -m),
-		       "$package release $dversion for $csuite [dgit]");
-	push @tag_cmd, $tag;
-	runcmd_ordryrun @tag_cmd;
-	
-
-	push @tag_cmd, qw(-u),$keyid if defined $keyid;
-	push @tag_cmd, qw(-u),$keyid if defined $keyid;
 
+    if ($sign) {
 	my @debsign_cmd = @debsign;
 	push @debsign_cmd, "-k$keyid" if defined $keyid;
 	push @debsign_cmd, $changesfile;