path: root/debian
diff options
authorIan Jackson <>2016-06-04 15:04:28 +0100
committerIan Jackson <>2016-07-16 16:47:47 +0100
commit71350fe30f7449b24dc2884b42cc5ff50a2bf84e (patch)
tree3cb472956e6ec744327a2ac4403e222cb7a4bf6c /debian
parentdfec10c836bfb4cf5bc80e0e90d6d7306442be1b (diff)
Split brain: Make quiltify_trees_differ cleverer
Have it be able to explain what was different, by returning a bitmask. Update the call sites. Incidentally, fix a bug where .gitignores other than in the toplevel would not be ignored when they ought to have been.
Diffstat (limited to 'debian')
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5842873..30db5c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ dgit (1.5~~) unstable; urgency=medium
Instead, insist on a single one.
* dgit sbuild no longer deletes extranious .changes files; instead
we rely on --rm-old-changes, or failing that, fail early.
+ * When doing quilt linearisation, treat upstream .gitignores not
+ in the toplevel the same way we treat ones in the toplevel.
* Better error handling in dgit-repos-policy-debian.