summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* TODO.BRANCH: Many BTS bugs now fixedIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: mismatches-contents: New testIan Jackson2016-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: HEAD/.dsc mismatch error: Much better messageIan Jackson2016-10-11
| | | | | | Closes:#809516. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Rename mismatches-dscchangesIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Get sense of failed clone failed cleanup error reporting check correct.Ian Jackson2016-10-10
| | | | | | Closes:#796773. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: gitconfig: New testIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New config option slurping approachIan Jackson2016-10-10
| | | | | | | | | Allows local git config options to override user-global ones, as is proper. Closes:#835858. Also, we now need to handle -c options ourselves. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: unrepresentable: New testIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* 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: quilt analysis: quiltify_trees_differ: provide new $unrepres argIan Jackson2016-10-10
| | | | | | No-one passes this yet, so no functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt analysis: Print orig and HEAD tree hashes.Ian Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt analysis: Replace H2O with O2HIan Jackson2016-10-10
| | | | | | | | Right now the direction of the diff does not matter, but soon it will, and the natural direction is O2H, not O2H. Change all references. No functional change. 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>
* dgit: Break out @files_csum_info_fields (nfc)Ian Jackson2016-10-10
| | | | 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>
* 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>