summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: Finalise 9.10debian/9.10archive/debian/9.10Ian Jackson2020-02-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes so far since 9.9Ian Jackson2020-02-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2020-02-02
|
* i18n: Updated nl.po fileFrans Spiesschaert2020-02-02
| | | | Closes: #945356
* dgit-maint-debrebase(7): Import tarball before committing gbp.confSean Whitton2020-02-02
| | | | | | | | | | | The workflow given previously fails to produce a history that can work with git-debrebase, because it has the first commit introducing debian/ be an ancestor of the first import of the upstream source. This is the final part of #932954. Closes: #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* d-m-{merge,debrebase}(7): Set 'merge' in gbp.confSean Whitton2020-02-02
| | | | | | | | | | | | This enables simplifying runes which are more frequently to be typed. 'merge-mode' no longer need be set since in the only case where the manpages recommend allowing `gbp import-orig` to perform a merge, a different merge mode is required (and specified in that rune). This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in gbp.confSean Whitton2020-02-02
| | | | | | | | | | | | | This is a useful convention to distinguish actual upstream tags from upstream tarball-representing tags created by the Debian package maintainer. Note that use of this convention is already recommended in section "Using untagged upstream commits". This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit(1): Do not talk about `intermediate' uploadsIan Jackson2020-02-02
| | | | | | | Incorporate Sean's review comment in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928473#57 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Terminology: Change "rewind" to "rewrite" where appropriateIan Jackson2020-02-02
| | | | | | | | | | | | | | | | | | | | | In #928473, Colin Watson writes: > the use of "rewind" as a synonym for "non-fast-forwarding", while > somewhat common in git terminology, is unfortunate. The terms seem > to be borrowed from video playback systems, where "rewind" is often > just the exact opposite of "fast-forward", and so when I see > "rewinding history" in a few places in dgit(1) my initial > interpretation is that it must mean "updating a ref to point to an > ancestor of the commit that it previously pointed to", whereas I > think dgit(1) means "any push that isn't a fast-forward". I don't > know if I'm the only one for whom it has that connotation. This makes sense. So, I am changing uses of "rewind" which do not mean precisely going back to an ancestor. I think we can often use the word "rewrite" for the more general case, but there are some places where another wording is better. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Cover more cases of --overwrite and --deliberatelyIan Jackson2020-02-02
| | | | | Closes: #928473 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debpush: avoid a pipefail problem in get_file_from_refSean Whitton2020-02-02
| | | | | | | | | | | | | | `grep -q` exits as soon as it finds a matching line, potentially sending a SIGPIPE to git-ls-tree. We have pipefail turned on, so that can make the whole pipeline exit nonzero, which is wrong when grep did in fact find a match. This solution is more readable than disabling pipefail just for this line (as is done elsewhere in git-debpush). Closes: #940588 Reported-by: Andrej Shadura <andrewsh@debian.org> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* tests: import-dsc: Test corrupted ENV (#950446)Ian Jackson2020-02-02
| | | | | Closes: #950326 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: absurd: Work around mangled env metadata from gbpIan Jackson2020-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of gbp pq will pass broken metadata from patch files into the env vars for git-commit-tree. Eg, #950446/#950326 where gbp pq from buster cannot cope with binutils_2.33.90.20200122-2.dsc, setting GIT_AUTHOR_DATE to "???" (literally, three ? marks, as copied from the patch file libctf-soname.diff). Work around this as follows: * Try git-commit-tree of an empty commit message. Does it work? If so, workaround is not needed. * Try resetting GIT_AUTHOR_* to GIT_COMMITTER_*. Does it work now? Ah, that is the fix! * Otherwise, just run git-commit-tree as usual. This code makes some perhaps-unreasonable assumptions: * gbp's git commit-tree has the tree object as 2nd argument (really shonky command line parsing). However, if this assumption is violated, the result is that the git-commit-tree attempts either fail harmlessly, or succeed harmlessly, defeating the workaround but with no other implications. * if a workaround is needed, it is best to throw away all the author information, rather that try to pick and choose, or to fix it up. These are IMO tolerable because I think it's gbp's job to get this right. The output from dgit (if it succeeds) will be right in terms of tree and even in terms of commit structure. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: absurd: Break out PATH filteringIan Jackson2020-02-02
| | | | | | | Actually this function just sets it to the already-computed $npath, but this is an implementation detail. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: absurd: Provide a way for absurd git to print warningsIan Jackson2020-02-01
| | | | | | | | The file ../../absurd-apply-warnings is dumped to dgit's stderr. Nothing writes to it yet, so no overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 9.10Ian Jackson2019-09-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.9debian/9.9archive/debian/9.9Ian Jackson2019-09-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes since 9.8Ian Jackson2019-09-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-09-14
|
* dgit-maint-bpo(7): Mention occasional need for --newIan Jackson2019-09-14
| | | | | Closes: #935443 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debpush(1): warning about use of forcing optionsSean Whitton2019-09-14
| | | | | | | Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Closes: #935084
* git-debpush(1): note that --quilt=baredebian+git is an aliasSean Whitton2019-09-14
| | | | | | | Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Relates-to: #935084
* infra: dgit-mirror-ssh-wrap: Fix $package_reIan Jackson2019-09-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add missing dependency on liburl-perlIan Jackson2019-09-13
| | | | | | | | | | | This is only a Recommends in dgit.deb so we need to pull it in explicitly for the tests that need it. We add the dependency unconditionally to the test suite tests that depend on dgit, since that avoids having to track exactly when it's needed. (This module has an Installed-Size of 228.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control: Add missing dependency on liburl-perlIan Jackson2019-09-13
| | | | | | | | | | dgit uses URI::Escape for archive_query_aptget. This is a Recommends, because if you never use the aptget method you don't need it. (But few installations can do without the aptget method entirely.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit-mirror-ssh-wrapIan Jackson2019-09-13
| | | | | | | This script will break if rsync changes the way it passes arguments to the peer. We need to catch that. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* infra: New script dgit-mirror-ssh-wrapIan Jackson2019-09-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* lintian: Override source format warningsIan Jackson2019-09-13
| | | | | | | | | | | I also don't agree that missing source format is a problem. The semantics are well defined. There are difficulties with 3.0 native (for example, that it forbids non-native versions) so 1.0 must continue to be used so that it continues to exist. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-09-08
|
* lintian: Override some checksIan Jackson2019-09-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mannpage message on line 51 is warning: file `<standard input>', around line 51: table wider than line width and refers to this line dgit-maint-gbp(7) for maintainers already using git-buildpackage which does in fact fit (just) in an 80-column xterm. I hope dgit-badcommit-fixup is never going to be needed enough again to need a manpage. I don't agree that trailing whitespace in changelog is a problem. Remaining messages from lintian -EI --pedantic --no-tag-display-limit --suppress-tags=syntax-error-in-debian-changelog,changelog-empty-entry ../bpd/dgit_9.9~_multi.changes are as follows: W: dgit source: missing-debian-source-format I: dgit source: older-source-format 1.0 I don't agree that source format 1.0 is wrong. There are difficulties with 3.0 native (for example, that it forbids non-native versions) so 1.0 must continue to be used so that it continues to exist. I also don't agree that missing source format is a problem. The semantics are well defined. P: dgit source: package-uses-old-debhelper-compat-version 9 W: dgit source: unnecessary-testsuite-autopkgtest-field I like to keep things backwards compatible for a much longer time than most people. jessie is currently oldoldstable and has dh 9. P: dgit source: no-dep5-copyright I don't have effort for this. I think it is largely busywork but I would accept a patch. I: dgit: package-contains-empty-directory usr/share/man/man5/ Avoiding this is awkward. W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-mirror-rsync W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-admin-debian W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-policy-debian W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-policy-trusting W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-repos-server W: dgit-infrastructure: binary-without-manpage usr/bin/dgit-ssh-dispatch In principle manpages for some of all of these would be good. But the usefuless of these programs is largely limited to people whose requirements are extremely similar to Debian's. Most people can just use a normal git server. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: update Vcs-Git to end in .gitIan Jackson2019-09-08
| | | | | | | | | | In https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888809 Paul Wise writes Salsa redirects git to URLs ending in ".git/" and redirects browsers to the URL not ending in ".git/" or ".git". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: Drop redundant Priority fieldIan Jackson2019-09-08
| | | | | | Found by lintian. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Extend extended description.Ian Jackson2019-09-08
| | | | | | | Mentioning what the competition is may help both discoverability and useability. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Fix a typo (found by lintian)Ian Jackson2019-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: Bump Standards-VersionIan Jackson2019-09-08
| | | | | | | | | | | | | | | | | I have been through the upgrading checklist. I came across two things which were mentioned but which I haven't implemented: * nodoc build option. It's not clear to me whether this is superseded by the nodocs build profile. If we wanted to bootstrap using dgit, the build profile would probably be better. * using ${perl:Depends}. I looked into this briefly and dh_perl doesn't seem to DTRT right now: it doesn't spot any of the modules we use. I'm not sure why and have decided to punt on this for now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* control: Change priority of dgit-infrastruture to extraIan Jackson2019-09-08
| | | | | | Pursuant to policy upgrading checklist. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,debrebase}(7): Use git fetch --tags upstreamSean Whitton2019-09-08
| | | | | | | | | We recommend using a remote called 'upstream' and so we can recommend a command which will be faster and less likely to error out. Closes: #939679 Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: start 9.9Ian Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.8debian/9.8archive/debian/9.8Ian Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes since 9.7Ian Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2019-09-06
|
* test suite: Check that archive skew machinery reports warningIan Jackson2019-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Check that archive skew machinery succeedsIan Jackson2019-09-06
| | | | | | | | This is actually the point of this test case. perling $tmp/aq/package... is a bit of a bodge, but fine. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Once again cope with archive skewIan Jackson2019-09-06
| | | | | | | | | | | | | | | Since our http rearrangements, we have lost the ability to try multiple dsc versions which means we cope badly with archive skew. This was an editing error: in 7821907696db dgit: Abolish url_get in favour of url_fetch we omitted to notice that url_get implicitly does what url_fetch needs Ok404 to do. So we didn't add the Ok404 parameter. Fix this by adding it now. Closes: #935874 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: clone-skew: Test for accessing mirror via httpIan Jackson2019-09-06
| | | | | | | | | | This test is misnamed right now, but really we are going to make it do something interesting. Right now it just sets everything up to access the mirror via http rather than file://. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-archive: Honour t_archive_ln_sIan Jackson2019-09-06
| | | | | | | | This will let us arrange to use cp instead. No functional change for existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: curl: pass CURLOPT_FOLLOWLOCATIONIan Jackson2019-09-06
| | | | | | | This was accidentally dropped in the 9.6 http changes. Closes: #939564 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-{merge,debrebase}(7): Use git fetch --all --tagsSean Whitton2019-09-05
| | | | | | | | | | | | | | | `git remote update` doesn't fetch tags unless remote branches include the commits at which those tags point. Thus, if upstream pushes their release tag but fails to push their master branch, `git remote update` will not fetch the release tag. I've been in this situation more than once when following the workflows detailed in these manpages, so let's just recommend a command which will definitely try to fetch the latest release tag. Closes: #939504 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test already-tagged checkIan Jackson2019-09-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fail early when the archive/ tag already exists.Ian Jackson2019-09-05
| | | | | | | | | Suggest using a new version number. We need a new --force option to override this check. Closes: #935802 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 16:45:58 +0000