summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Better error message if HEAD contains changes unrepresentableIan Jackson2016-10-10
| | | | | | by `3.0 (quilt)'. Closes:#834618. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Better error message if non-split-brain patch stack no longer appliesIan Jackson2016-10-10
| | | | | | (due to new upstream version, or user messing with it). Closes:#833025. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention #833025 re --quilt=Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit.1: Document the expected form of HEAD for each --quilt= mode.Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit.1: Discourage use of the --PROGRAM:OPTION escape hatch.Ian Jackson2016-10-10
| | | | | | (Apropos of various bug reports including #800060.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention #800110Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: mismatch: New testIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Before committing to push, check that .dsc and .changes correspond.Ian Jackson2016-10-10
| | | | | | Closes:#800060. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention #800060Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit.1: Clarify the --clean= options' documentation. Closes:#800054.Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Test that we pass correct -v to genchangesIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Arrange for the special dgit remote to be skipped by git fetch --all etc.Ian Jackson2016-10-10
| | | | | | | | | | Closes:#827892. Not quite the patch from Sean: we want to do this on every fetch, and we don't overwrite the user's configuration if for some reason they have set this (hopefully they haven't...) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Don't break if user has push.followTags=true. Closes:#827878.Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Fix location of a bugfix entryIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Update changelog for fetch specIan Jackson2016-10-10
|
* Update changelog for in-archive copiesIan Jackson2016-10-10
|
* Update changelog for --quilt= split brainIan Jackson2016-10-10
|
* Update changelog for tag formatIan Jackson2016-10-10
|
* Make --quilt=gbp the default for dgit gbp-build.Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Quilt output: Honour and strip Gbp-pq headersIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Quilt admin commits: Provide [dgit ...] in all of themIan Jackson2016-10-10
| | | | | | | | With the version number, in general. (These are used during quiltification of the user's branch, not during import, so they don't need to be stable.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Quilt output: Produce output like git-format-patchIan Jackson2016-10-10
| | | | | | | | Do not .-convert the message and stuff it in Description. Instead, generate a normal-looking patch with From and Subject. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-nonnative: Enhanced and finishedIan Jackson2016-10-08
| | | | | | | | | | | Use t-git-next-date. (Our GIT_AUTHOR_DATE settings were wrong and therefore ineffective.) Add a 1.0 with diff test. Add some comments about package format. Now the test is finished. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Add dependency on git-buildpackageIan Jackson2016-10-08
| | | | | | Now we may run gbp pq import even if user is not using gbp. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-native: New testIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-quilt: Initial version of new test caseIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: orig files: cope with signaturesIan Jackson2016-10-08
| | | | | | | Fix up .orig detection to handle .asc's (and other signatures) of .orig components the same way as their tarballs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: orig files: Fix .orig-comp pattern matchIan Jackson2016-10-08
| | | | | | | Fix up .orig detection to correctly allow exactly the right .orig-comp components accorging to dpkg-source(1). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix up .orig detection to be less trustful of (ambiguous) filenames.Ian Jackson2016-10-08
| | | | | | | | | | | | | | | | | We cannot simply match the filenaem because `foo_1.0.orig.tar.gz' might be the `.orig.tar.gz' of foo version 1.0, or the `.tar.gz' of foo version 1.0.orig. We need either to consider the whole .dsc (this works since the formats with no `.orig' or `.debian' or whatever are precisely ones where there is only one file anyway), or know the version number. Replace is_orig_file with two functions, one for each situation. While we're here, do not barf if we find uncompressed tarballs. (We don't expect to find any but it would be nice if they worked...) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix two calls to chdir without proper error checking.Ian Jackson2016-09-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Do not fail to do some important quilt processing in some --quilt modes.Ian Jackson2016-09-28
| | | | | | | Make `madformat' mean precisely `is 3.0 (quilt)' and change the two call sites which wanted to check the quilt mode too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Test --overwrite (without VERSION)Ian Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: getfield, parsechangelog: Fix two bugs in error reportingIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Test --overwrite=VERSIONIan Jackson2016-09-26
|
* Overwrite: Document --overwrite=VERSIONIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-splitbrains: RenameIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Test --quilt=unapplied and --quilt=dpmIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: oldnewtagalt: New testIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add spelling testIan Jackson2016-09-26
| | | | | | Fail this test if the tree contains the misspelling of "pseudo". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Turn gc.auto off in our hidden working tree setupsIan Jackson2016-09-26
| | | | | | | | | This avoids potential accidents: git gc --auto might otherwise run and do very undesirable things to the user's working tree. (I haven't been able to trigger such a situation deliberately and none has been reported, luckily...) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp-build-modes-sbuild: Split outIan Jackson2016-09-25
| | | | | | | Now the other tests can run even if the sbuild chroot is not available. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: debpolicy-quilt-gbp: New testIan Jackson2016-09-25
| | | | | | Check that drs and Debian policy permit split brain. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gb-build-modes: Fixes, passes nowIan Jackson2016-09-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp-build-modes: New test, which does not pass yetIan Jackson2016-09-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: Is finishedIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: New test (does not pass yet)Ian Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Use GIT_COMMITTER_DATE for automatic patchIan Jackson2016-08-14
| | | | | When automatically generating quilt patch, honour GIT_COMMITTER_DATE for filename creation (makes filename deterministic in test suite).
* Test suite: Test pushing with forcing old and new tag formatIan Jackson2016-07-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document test suite better infoIan Jackson2016-07-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp: New test (not yet complete)Ian Jackson2016-07-17
| | | | | | | | This test does not yet do all that we want, but it does some things and then exits 0. The current intent for the future is written in prose in the rest of the file.