summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-10-27 17:51:35 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-11-08 16:16:42 +0000
commit979ce26f5de342743c7b6fa207cd22c66f55af1d (patch)
treef5c70207374223400053516a76ead47069e030ff /tests
parent25be7c924fe6d7cc12725f54f1f1c78e5981df6f (diff)
Do not have .pc in dgit's git history for format `3.0 (quilt)'
packages. * When constructing a git tree from a .dsc (which we do by unpacking it in a temporary directory), drop any .pc directory. * Rewrite the quilt fixup preparation: we now fake up a .dsc so that we can regenerate the .pc, which is needed by dpkg-source. * If after we have committed any quilt fixup, there is a .pc directory, make a commit removing it. * We now construct new quilt patches in a temporary directory, so there is no problem about ignored files or --ignore-dirty. Remove the mention of this limitation from the manpage. * Be less critical of `3.0 (quilt)' and improve the documentation relating to the interaction between dpkg-source and dgit. Mention git-dpm. * When `committing quilty patches', do not re-add a deleted .pc directory (while still permitting updates to an existing .pc - although the .pc will then disappear in the next commit). * In the test suite, disregard differences found in .pc. * cmd_quilt_fixup sets $package for the benefit of build_maybe_quilt_fixup
Diffstat (limited to 'tests')
-rw-r--r--tests/lib2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lib b/tests/lib
index e17be7f..0133987 100644
--- a/tests/lib
+++ b/tests/lib
@@ -116,7 +116,7 @@ t-dgit () {
}
t-diff-nogit () {
- diff --exclude=.git -ruN $*
+ diff --exclude=.git --exclude=.pc -ruN $*
}
t-cloned-fetched-good () {