dgit: dpkg_source_ignores: Exclude the right set of things

Change the dpkg-source -i argument to exclude exactly the right set of
things.  (Sadly this is not a simple rune.)

Previously we might exclude `foo.git', for example !

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

diff --git a/debian/changelog b/debian/changelog
index 83ac5f787b7c195c6eaa77a365de663941e805d3..743a7278b37d7056be1d5e5ce359ed3c75f8f3f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dgit (4.1~) experimental; urgency=medium
     bugs; the tests for this are not very comprehensive.  And
     worktrees on different filesystems may not work; that's a
     matter for the future.  Closes:#868515.
+  * Change the dpkg-source -i argument to exclude exactly the right
+    set of things.  (Sadly this is not a simple rune.)
 
   Other improvements to dgit:
   * New print-dpkg-source-ignores option to print the big rune

diff --git a/dgit b/dgit
index 9834d03b8d682b75108beb9f489b9cd56b2982b4..248a7cbfff5f8a0726f3b8ca08f1c242389867ac 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -100,7 +100,7 @@ our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
 our $splitbraincache = 'dgit-intern/quilt-cache';
 our $rewritemap = 'dgit-rewrite/map';
 
-our @dpkg_source_ignores = qw(-i\.git/ -I.git);
+our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
 
 our (@git) = qw(git);
 our (@dget) = qw(dget);

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index df1f953cdeb8956cd9e3aecf789a892b454cfac7..901707e6eaf2fcec9526eec5345fe0095a4f813d 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -209,7 +209,7 @@ Then make new upstream tags available:
 
 Now you simply need to ensure that your git HEAD is dgit-compatible,
 i.e., it is exactly what you would get if you ran
-B<dpkg-buildpackage -i'\.git/' -I.git -S>
+B<dpkg-buildpackage -i'(?:^|/)\.git(?:/|$)' -I.git -S>
 and then unpacked the resultant source package.
 
 =for dgit-test dpkg-source-ignores end