summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld <djpig@debian.org>2006-02-11 00:11:02 +0000
committerFrank Lichtenheld <djpig@debian.org>2006-02-11 00:11:02 +0000
commitfb843e5cac434c71121f34717128956e958a7fba (patch)
treea77d85147072b9507198044398e636be0d66683e
parent854ad168370000ca46f4ba091c2d5bb05274b6ef (diff)
downloaddpkg-fb843e5cac434c71121f34717128956e958a7fba.tar.gz
Add .git directory to default dpkg-source -i regex.
Suggested by Hans Ulrich Niedermann. Closes: #351885
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog2
-rwxr-xr-xscripts/dpkg-source.pl2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index efe517dd9..58295c2c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-11 Frank Lichtenheld <djpig@debian.org>
+
+ * scripts/dpkg-source.pl: Add .git to
+ $diff_ignore_default_regexp
+
2006-02-10 Denis Barbier <barbier@linuxfr.org>
* scripts/dpkg-source.pl: Touch all patched files
diff --git a/debian/changelog b/debian/changelog
index 435b0453a..f7a14ac8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
more complex setups (Julian Gilbey). Closes: #163061
* Add files and dirs used by bzr to default dpkg-source -i regex
(maximilian attems). Closes: #345164
+ * Add .git directory to default dpkg-source -i regex.
+ Suggested by Hans Ulrich Niedermann. Closes: #351885
* dpkg-scanpackages can now output Packages files with multiple
versions of a single package (Don Armstrong). Closes: #229589.
* dpkg-scanpackages outputs help when given the --help or -h option
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 4159b5bae..d5cd8e2ee 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -20,7 +20,7 @@ $diff_ignore_default_regexp = '
# File-names that should be ignored (never directories)
(?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore)$|
# File or directory names that should be ignored
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.bzr(?:\.backup)?)(?:$|/.*$)
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.git|\.bzr(?:\.backup)?)(?:$|/.*$)
';
# Take out comments and newlines