summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 02:54:27 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-09 13:08:32 +0000
commita1fb6b5478b7189452d1cd2e9098a69fe2db6825 (patch)
tree6c9f207e616021fba56464b9506e655c0e0cd396 /dgit
parentb0bc4d204e5900c7888e681404e2638ce7347cf9 (diff)
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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit1
1 files changed, 1 insertions, 0 deletions
diff --git a/dgit b/dgit
index 909ac95..d62694a 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";