summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* 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>
* Test suite: stunt Parse.pm: add comment about %optionsIan 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>
* dgit.1: Document --quilt=gbp et al.Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Quilt output improved nowIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt: Test that our patch makes it through dgit and gbp pqIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt: Provide Gbp-pq headers in our new patch test caseIan Jackson2016-10-10
| | | | | | And expect dgit to honour them 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: Normalise trailing newlines in commit messageIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Quilt output: Include Date headerIan Jackson2016-10-10
| | | | | | Copy this from the commit's author date. 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>
* README.dsc-import: Ship to /usr/share/docIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* README.dsc-import: Document actually-imported approachIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* .gitignore: Add debhelper-build-stampIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* NOTES: Remove obsolete fileIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: done from TODO.BRANCHIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: DocumentIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Manpage: Embolden some command option stringsIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: Honour --gbp-pq instead of --gbpIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: Provide --gbp-buildIan Jackson2016-10-08
| | | | | | | And, provide the sub opts_opt_multi_cmd to help with options of this kind. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: Introduce gbp_pq function (nfc)Ian Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Tidy up output from gbp pqIan Jackson2016-10-08
| | | | | | | | | | | gbp pq import can print some warnings if it doesn't like the patches much. There is no point showing these warnings to the user of `dgit clone' or `dgit fetch'. As for the warnings in split brain mode, we will leave those, and leave them with colour enabled. 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: Set GIT_COMMITTER_* and GIT_AUTHOR_*Ian Jackson2016-10-08
| | | | | | | gbp pq import generates commits which are affected by these (COMMITTER always and AUTHOR sometimes). But we need imports to be stable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Set GIT_AUTHOR_* tooIan Jackson2016-10-08
| | | | | | | Sometimes the patches don't have authorship information, in which case using the caller's is wrong. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: .gitignore patch: Slightly better commit messageIan Jackson2016-10-08
| | | | | | Don't sort-of-imply that the dgit version is the package version. 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: Make t-archive-none idempotentIan Jackson2016-10-08
| | | | | | | No overall functional change just yet, but it means we can wipe our test archives. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Fix two test cases (git-foo => git foo)Ian Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New fetch algorithm: Fix a messageIan Jackson2016-10-08
| | | | | | This should have been debug output all along. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Get rid of some pointless outputIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Import: Add a lot of debuggingIan 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>
* TODO.BRANCH: Consequences of new importIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Entirely new import algorithmIan Jackson2016-10-08
| | | | | | See README.dsc-import (which needs some updating). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: make_commit_text: Some more debugIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Introduce make_commit_text (nfc)Ian Jackson2016-10-08
| | | | | | No callers yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>