chiark / gitweb /
dgit: When generating orig+debian/patches view, copy debian/ from HEAD.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 9 Jan 2017 02:54:27 +0000 (02:54 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 9 Jan 2017 13:08:32 +0000 (13:08 +0000)
This makes less noise in diffs.  Closes:#850095.

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

index 4556644..708c68a 100644 (file)
@@ -29,6 +29,8 @@ dgit (3.0~) unstable; urgency=medium
   * Use refs/dgit-fetch/DISTRO rather than refs/dgit-fetch/DISTRO,
     which leads to less duplication and so less clutter.
   * Enforce a reasonable syntax for nominal distro names.
+  * When generating orig+debian/patches view, copy debian/ from
+    HEAD.  This makes less noise in diffs.  Closes:#850095.
 
   Docuentation [Sean Whitton]:
   * dgit-sponsorship(7): Use --no-dep14tag.  Closes:#849105.
diff --git a/dgit b/dgit
index 909ac95..d62694a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5416,6 +5416,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
+    runcmd @git, qw(checkout -f), $headref, qw(-- debian);
     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";