X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=8d13d15a4e305238bea9b621cc39f8e0bf809c08;hp=630c9f7441e707b37ffaea0021ba91c6a7a21652;hb=934524a7a8f9fbcd193f0b21bac392e9444912e4;hpb=9d2b2161c18c031a96bc2ba3b8e749f2cc44fc23

diff --git a/dgit b/dgit
index 630c9f74..8d13d15a 100755
--- a/dgit
+++ b/dgit
@@ -1566,6 +1566,7 @@ sub check_for_vendor_patches () {
 
 sub generate_commits_from_dsc () {
     # See big comment in fetch_from_archive, below.
+    # See also README.dsc-import.
     prep_ud();
     changedir $ud;
 
@@ -2629,7 +2630,11 @@ sub commit_quilty_patch () {
     }
     my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
     runcmd_ordryrun_local @git, qw(add -f), @adds;
-    commit_admin "Commit Debian 3.0 (quilt) metadata";
+    commit_admin <<END
+Commit Debian 3.0 (quilt) metadata
+
+[dgit ($our_version) quilt-fixup]
+END
 }
 
 sub get_source_format () {
@@ -3636,13 +3641,10 @@ sub quiltify_dpkg_commit ($$$;$) {
     mkpath '.git/dgit';
     my $descfn = ".git/dgit/quilt-description.tmp";
     open O, '>', $descfn or die "$descfn: $!";
-    $msg =~ s/\s+$//g;
-    $msg =~ s/\n/\n /g;
-    $msg =~ s/^\s+$/ ./mg;
+    $msg =~ s/\n+/\n\n/;
     print O <<END or die $!;
-Description: $msg
-Author: $author
-$xinfo
+From: $author
+${xinfo}Subject: $msg
 ---
 
 END
@@ -3780,7 +3782,11 @@ END
 	print SERIES "auto-gitignore\n" or die $!;
 	close SERIES or die  $!;
         runcmd @git, qw(add -- debian/patches/series), $gipatch;
-        commit_admin "Commit patch to update .gitignore";
+        commit_admin <<END
+Commit patch to update .gitignore
+
+[dgit ($our_version) update-gitignore-quilt-fixup]
+END
     }
 
     my $dgitview = git_rev_parse 'refs/heads/dgit-view';
@@ -3975,8 +3981,14 @@ sub quiltify ($$$$) {
 	$commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
 	my $author = $1;
 
+	my $commitdate = cmdoutput
+	    @git, qw(log -n1 --pretty=format:%aD), $cc;
+
 	$msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
 
+	my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
+	$strip_nls->();
+
 	my $title = $1;
 	my $patchname = $title;
 	$patchname =~ s/[.:]$//;
@@ -4001,6 +4013,7 @@ sub quiltify ($$$$) {
 	runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
 
 	quiltify_dpkg_commit "$patchname$index", $author, $msg,
+	    "Date: $commitdate\n".
 	    "X-Dgit-Generated: $clogp->{Version} $cc\n";
 
 	runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
@@ -4076,7 +4089,11 @@ sub quilt_fixup_linkorigs ($$) {
 
 sub quilt_fixup_delete_pc () {
     runcmd @git, qw(rm -rqf .pc);
-    commit_admin "Commit removal of .pc (quilt series tracking data)";
+    commit_admin <<END
+Commit removal of .pc (quilt series tracking data)
+
+[dgit ($our_version) upgrade quilt-remove-pc]
+END
 }
 
 sub quilt_fixup_singlepatch ($$$) {