summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* changelog: start 2.16~Ian Jackson2017-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.15 (will not be uploaded)Ian Jackson2017-01-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Do not tolerate any stderr output from git-fsckIan Jackson2017-01-05
| | | | | | | | | | We must tolerate notice: HEAD points to an unborn branch (master) notice: No default references which are generated by some of our existing test cases and are pretty much harmless. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Introduce t-expect-fsck-failIan Jackson2017-01-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Make expect_fsck_fail contain objidsIan Jackson2017-01-05
| | | | | | This will make it possible to be stricter. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge tag dgit/2.14 into `defence in dgit-repos-server' branchIan Jackson2017-01-05
|\ | | | | | | | | | | | | | | | | | | Fix up semantic conflict: the new git-fsck test (in 2.14) fails on the new broken commits (in the `defence in dgit-repos-server' branch). We need to disable this. Ideally we would make a tighter test, but that's too much to do in a merge. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 2.14debian/2.14archive/debian/2.14Ian Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Document changesIan Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Do not generate bogus commitsIan Jackson2017-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two places in the code where ill-formed commits were generated: both psedumerges. One is in dgit import-dsc, a fairly minor problem. The other is in --overwrite and is very bad because that's an important option. Nothing in git seems to notice, unless you run git-fsck. Even a git server does not, by default. However, some other popular git servers do reject these broken commits. I have tested this changes with git-fsck (by using the test suite patches which follow in this series) and now everything seems fine. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Clean out erroneous reflog in a worktreeIan Jackson2017-01-04
| | | | | | | | | | | | | | | | git-reflog expire --expire-unreachable=now --all Without this, this worktree causes git-fsck to complain! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Run git-fsck a lotIan Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Add some missing calls to t-ok.Ian Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Introduce t-ok.Ian Jackson2017-01-04
| | | | | | | | | | | | | | | | | | | | | | No functional change. perl -i~ -pe 's/^echo ok\.$/t-ok/' tests/tests/*[^~] perl -i~ -pe 's/^echo ok\.$/t-ok/' tests/setup/*[^~] perl -i~ -pe 's/^echo done\.$/t-ok/' tests/tests/*[^~] perl -i~ -pe 's/^echo done\.$/t-ok/' tests/setup/*[^~] Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 2.14Ian Jackson2017-01-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Test bad commit defence in drs-push-rejectsIan Jackson2017-01-05
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit-repos-server: Defend against bad commits (from eg #849041).Ian Jackson2017-01-05
| | | | | | | | | | | | | | Right now, this causes the test `debpolicy-quilt-gbp' to fail, because in this branch #849041 is unfixed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: start 2.14Ian Jackson2016-12-21
|/ | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.13debian/2.13archive/debian/2.13Ian Jackson2016-12-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: document dgit-sponsorship fixIan Jackson2016-12-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-sponsorship(7): Update in light of fixed #844129Sean Whitton2016-12-20
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: document dgit-maint-gbp fixIan Jackson2016-12-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-gbp(7): Remove reference to closed bug.Sean Whitton2016-12-20
| | | | | | Thanks Felipe Sateler for the bug report. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* Import fix: Switch back to unpa branch on patch import iterations.Ian Jackson2016-12-20
| | | | | | | In particular, do not fail utterly if dpkg-source and gbp disagree. Closes:#848843. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Improve "cannot represent change" messageIan Jackson2016-12-20
| | | | | | Print the git old and new modes too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* quilt fixup: Permit creation of patches which delete filesIan Jackson2016-12-20
| | | | | | | | | | | By psssing --include-removal to dpkg-source, and tolerating it when we do our quilt fixup analysis. dpkg-source has supported this since at least stretch. Closes:#848901. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.13Ian Jackson2016-12-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 2.12archive/debian/2.12Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd/git: Do not fail to import a .dsc containing patches to .git/ (!)Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd/git Do not fail to import certain weird .dscsIan Jackson2016-12-19
| | | | | | | | | | | | | | A .dsc containing patches which patch files multiple times would be rejected by dpkg-source due to #848611. Work around this by arranging for the patch of interest to never be the first patch, by introducing (and then evaporating) a dummy patch. Yuk. Closes:#848391. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Produce better error reporting when absurd git wrapper fails on a patchIan Jackson2016-12-19
| | | | | | | | | | | | | | | | | | | | | | | | during .dsc import. Apropos of #848391. gbp swallows the error from the first run (without --whitespace=fix). Previously only that first run would do anything useful; the second would complain about --whitespace=fix. So failures of dpkg-source would always produce a useless error message. Instead, tolerate (and ignore) the --whitespace=fix option which gbp passes during the second run. This means that the second run tries to do the actual work. This only does extra work if the first run failed, and since the first and second runs are now equivalent, that happens when the second run fails too. But in return for that extra work, we get a report which actually mentions something that unexpectedly went wrong. (The alternative would be to have absurd/git try to stash and then reproduce its previous error, or to make more fragile assumptions about gbp's behaviour.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd/git: Better debuggingIan Jackson2016-12-19
| | | | | | | Honour DGIT_ABSURD_DEBUG, which is set by dgit from $debuglevel. Also, in dgit, open the output file for append. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* absurd/git: Introduce log()Ian Jackson2016-12-19
| | | | | | | Right now this simply replaces all the echo >&2, producing no significant functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Do not fail when cloning a package containing dangling symlinks.Ian Jackson2016-12-19
| | | | | | Closes:#848512. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* By default, generate a DEP-14 tag as well as a dgit archive/* tagIan Jackson2016-12-19
| | | | | | | | Even in non-split-view quilt modes. Closes:#844129. This breaks one of the test suite test cases, so disable it there. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out access_cfg_tagformats_can_splitbrainIan Jackson2016-12-19
| | | | | | | | While we're at it, use a hash %y rather than repeatedly grepping. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Suppress some leftover debugging output from import-dsc. Closes:#847658.Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* If we cannot hardlink origs into our extraction area, use symlinks instead.Ian Jackson2016-12-19
| | | | | | Closes:#844570. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Give better advice if .dsc/.changes signing failsIan Jackson2016-12-19
| | | | | | | If no changes are needed to the package, user may indeed just debsign and dput. Closes:#844131. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention #844128Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document closure of #847987Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-native: clarify which sort of nativePhilip Hands2016-12-19
|
* Slightly better message when .dsc not found.Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Version tags mangling: Protect dots, as per proposed update to DEP-14.Ian Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Introduce dep14_version_quoteIan Jackson2016-12-19
| | | | | | | Removes three identical copies of this y/// rune. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Mention dgit-maint-merge changesIan Jackson2016-12-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge remote-tracking branch 'spwhitton/maint-merge-updates' into fixIan Jackson2016-12-19
|\
| * dgit-maint-merge(7): Add upstream remote after dgit cloneSean Whitton2016-12-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-merge(7): Missing 'first'Sean Whitton2016-12-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-merge(7): Add upstream remote when convertingSean Whitton2016-12-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-merge(7): After converting, need --overwriteSean Whitton2016-12-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>