* pristine-tar: Add -m option to specify a commit message.

diff --git a/debian/changelog b/debian/changelog
index 48ce340..21ad3a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pristine-tar (0.10) UNRELEASED; urgency=low
+
+  * pristine-tar: Add -m option to specify a commit message.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 11 Feb 2008 12:04:45 -0500
+
 pristine-tar (0.9) unstable; urgency=low
 
   * Add smart branching for commits. (Cyril Brulebois)

diff --git a/pristine-tar b/pristine-tar
index fcd588a..79fdd93 100755 (executable)
--- a/pristine-tar
+++ b/pristine-tar
@@ -10,7 +10,7 @@ B<pristine-tar> [-vdk] gentar delta tarball
 
 B<pristine-tar> [-vdk] gendelta tarball delta
 
-B<pristine-tar> [-vdk] commit tarball [upstream]
+B<pristine-tar> [-vdk] [-m message] commit tarball [upstream]
 
 B<pristine-tar> [-vdk] checkout tarball
 
@@ -88,6 +88,10 @@ Debug mode.
 
 Don't clean up the temporary directory on exit.
 
+=item -m message
+
+Use this option to specify a custom commit message to pristine-tar commit.
+
 =head1 LIMITATIONS
 
 Only .tar, .tar.gz, and .tar.bz2 files are currently supported.
@@ -132,6 +136,7 @@ use constant BZIP2_METHOD_HUFFMAN => 0x68;
 my $verbose=0;
 my $debug=0;
 my $keep=1;
+my $message;
        
 # Force locale to C since tar may output utf-8 filenames differently
 # depending on the locale.
@@ -140,7 +145,7 @@ $ENV{LANG}='C';
 sub usage {
        print STDERR "Usage: pristine-tar [-vdk] gentar delta tarball\n";
        print STDERR "       pristine-tar [-vdk] gendelta tarball delta\n";
-       print STDERR "       pristine-tar [-vdk] commit tarball [upstream]\n";
+       print STDERR "       pristine-tar [-vdk] [-m message] commit tarball [upstream]\n";
        print STDERR "       pristine-tar [-vdk] checkout tarball\n";
        exit 1;
 }
@@ -615,7 +620,8 @@ sub commitdelta {
        my $branch="pristine-tar";
        my $deltafile=basename($tarball).".delta";
        my $idfile=basename($tarball).".id";
-       my $commit_message="pristine-tar data for ".basename($tarball);
+       my $commit_message=defined $message ? $message :
+               "pristine-tar data for ".basename($tarball);
 
        my $vcs=vcstype();
        if ($vcs eq "git") {
@@ -726,6 +732,7 @@ sub checkout {
 
 Getopt::Long::Configure("bundling");
 if (! GetOptions(
+       "m|message=s" => \$message,
        "v|verbose!" => \$verbose,
        "d|debug!" => \$debug,
        "k|keep!" => \$keep)) {