From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Jan 2017 02:54:27 +0000 (+0000)
Subject: dgit: When generating orig+debian/patches view, copy debian/ from HEAD.
X-Git-Tag: archive/debian/3.0~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a1fb6b5478b7189452d1cd2e9098a69fe2db6825

dgit: When generating orig+debian/patches view, copy debian/ from HEAD.

This makes less noise in diffs.  Closes:#850095.

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

diff --git a/debian/changelog b/debian/changelog
index 4556644d..708c68af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 909ac95f..d62694a9 100755
--- 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";