chiark / gitweb /
Support dgit-distro.<distro>.keyid config option.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 22 Aug 2013 14:18:27 +0000 (15:18 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 22 Aug 2013 14:18:27 +0000 (15:18 +0100)
debian/changelog
dgit
dgit.1

index e14257f..f0a3cb2 100644 (file)
@@ -2,6 +2,7 @@ dgit (0.4~pre2) experimental; urgency=low
 
   * Mangle debian/<version> tags the way git-buildpackage does
     (as of git-buildpackage 0.5.5, 3c6bbd0f4992f8da).
+  * Support dgit-distro.<distro>.keyid config option.
 
  --
 
diff --git a/dgit b/dgit
index c20ed35..78a0e31 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -815,6 +815,9 @@ sub dopush () {
        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 -s -m),
                       "Release $dversion for $csuite [dgit]");
        push @tag_cmd, qw(-u),$keyid if defined $keyid;
diff --git a/dgit.1 b/dgit.1
index 28ec02e..ee78e1b 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -411,6 +411,8 @@ on the dgit command line.
 .TP
 .BI dgit-distro. distro .ssh
 .TP
+.BI dgit-distro. distro .keyid
+.TP
 .BR dgit.default. *
 for each
 .BR dgit-distro. \fIdistro\fR . *