Quilt admin commits: Provide [dgit ...] in all of them

With the version number, in general.  (These are used during
quiltification of the user's branch, not during import, so they don't
need to be stable.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 1ad499d717ce1bf18435a9d47489802575665871..61b7765bb7a6edd32c01daae8e1aa8e0b4e9f46c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ dgit (1.5~~) unstable; urgency=medium
   * When generating quilt patches from git commits, make patches that
     look quite like git-format-patch output (rather than strange things
     based on an obselete interpretation of DEP-3).
+  * Several dgit-generated commits now have slightly better annotations
+    from dgit about what it was doing.
 
   Infrastructure:
   * Better error handling in dgit-repos-policy-debian.

diff --git a/dgit b/dgit
index 4b593fce78907ebcc9ab6ea95cb98461d68bb87e..8d13d15a4e305238bea9b621cc39f8e0bf809c08 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2630,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 () {
@@ -3778,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';
@@ -4081,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 ($$$) {