summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: finalise 9.14debian/9.14archive/debian/9.14Ian Jackson2021-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document fixesIan Jackson2021-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Better message for dirty treesIan Jackson2021-09-08
| | | | | Closes: #930930 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: test case for if user has diff.noprefix setIan Jackson2021-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-playtree-setup: Override git config diff.noprefixIan Jackson2021-09-08
| | | | | Closes: #973881 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): Clarify -fanchor-treated snagIan Jackson2021-09-08
| | | | | Closes: #977426 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-repos-server: Fix wrong un-mangling of epoch and ~ versionsIan Jackson2021-09-08
| | | | | Closes: #987304 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: work around deprecation of GZIPIan Jackson2021-09-08
| | | | | | | | | | | | | This makes things slower. But it avoids this warning gzip: warning: GZIP environment variable is deprecated; use an alias or script IMO this deprecation was a bad idea, but the boat has sailed. The new code here is less concurrent (which is bad) but the alternatives are rather more code to set up. Closes: #975624 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Run even more parallelIan Jackson2021-09-08
| | | | | | Some tests block on each other or on locks. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debpush: Add missing perl dependencyIan Jackson2021-09-08
| | | | | Closes: 940589 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: tolerate making quilt patches creating +x filesIan Jackson2021-09-08
| | | | | | | | | | | We allow files with mode 00755 too. This works now This seems to have been an accidental extension to the source formaat, resulting from an extension to GNU `diff` and `patch`, I think it is fair to allow it now. Closes: #949675 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Test creation of new symlink is treated as unrepresentableIan Jackson2021-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Add init.defaultBranch to two test casesIan Jackson2021-09-07
| | | | | | Our test suite is full of "master". So for now, just do these two tests. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-playtree-setup: Handle init.defaultBranchIan Jackson2021-09-07
| | | | | | | | | | | | | For now, we default to overriding this to "master" for the playtree. When this is widespread enough, callers will be able to set GIT_PLAYTREE_DEFAULT_BRANCH=main. When all do this we can make not setting that an error and then later we can get rid of it entirely. Closes: #972098 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Introduce t-debchange and set DEBEMAILIan Jackson2021-09-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 9.14Ian Jackson2021-02-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.13debian/9.13archive/debian/9.13Ian Jackson2021-02-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit.1: drop remark about sbuild not building arch-independentHelmut Grohne2021-02-12
| | | | | | | Since buster (more precisely sbuild/0.74.0-1), sbuild does default to building arch-all (unless you cross build). Closes: #952442
* dgit-maint-*(7): Advice for git-debpush usersSean Whitton2021-02-12
| | | | | | | | | | | | | dgit-maint-native(7) doesn't need updating because git-debpush(1) is clear that quilt mode options are required only for non-native packages. This commit leaves `dgit push{,-source}` as the first choice, with git-debpush(1) given as an alternative. We might want to change that in the future, but for the time being this makes sense. Closes: #932520 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* gitattributes defuse: work even if .git/info/attributes missingIan Jackson2021-01-29
| | | | | | | | | Treat this as "needs setup" rather than "needs adjustment". Closes: #981344 Reported-by: Andrej Shadura <andrewsh@debian.org> Tested-by: Andrej Shadura <andrewsh@debian.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 9.13Ian Jackson2020-08-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.12debian/9.12archive/debian/9.12Ian Jackson2020-08-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-mirror-ssh-wrap: Cope with yet another new rsync rune.Sergio Durigan Junior2020-08-19
| | | | | Closes:#968635. Signed-off-by: Sergio Durigan Junior <sergiodj@debian.org>
* changelog: start 9.12Ian Jackson2020-06-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 9.11debian/9.11archive/debian/9.11Ian Jackson2020-06-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: update for further changesIan Jackson2020-06-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-mirror-ssh-wrap: Cope with new rsync runeIan Jackson2020-06-22
| | | | | | | | | | | | rsync 3.2 passes -I and -v to the remote process. These options are no problem. Rather than making this into an single mess of a regexp, add a new regexp for the new rune. That's clearer and I think probably just about as future-proof. Closes: #963489 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-mirror-ssh-wrap: Fix syntax for multiple patternsIan Jackson2020-06-22
| | | | | | | | | We don't want to repeat $command =~ so we need to assign the command to $_; No functional change with the current single pattern. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-mirror-ssh-wrap: Clarify the error messageIan Jackson2020-06-22
| | | | | | | When we get an unexpected command, it would be nice to say who is reporting this problem and what has probably happened. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): Fix new-upstream -i docsIan Jackson2020-06-22
| | | | | | | | | | Firstly, the -i must come at the end. (After -i come more git-rebase options.) Secondly, this wasn't mentioned at all in the main section for new-upstream - only in the synopsis. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: new-upstream: Do not treat late options as versionIan Jackson2020-06-22
| | | | | | | | | | | Instead of a new upstream version, the user may wish to pass -i. (Or other git-rebase options.) This is handled correctly when we are deciding whether to treat further arguments as additional piece specifications, but the new optional upstream version commitish was mishandled in this respect. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Fix error message for wrong use of -iIan Jackson2020-06-22
| | | | | | | | | | | | | | | Getopt::Long with "i:s" parses "-i something" as "-i" with a value of "something". Maybe I didn't know this when I wrote this code, and thought the check for $val would only reject "-isomething". But "git-rebrebase ... -i something" is wrong because it would mean "git-rebase -i something" and we do not permit the user to specify their own base. So it is right to bail out in this case. However, the message was wrong, since it refers to cuddling, and it can be caused by a non-cuddled non-option argument. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Print pwd in failure trapIan Jackson2020-06-22
| | | | | | This will help debugging. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Provide navigation banner when exiting nonzeroIan Jackson2020-06-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: Cope with buster & eatmydataIan Jackson2020-06-22
| | | | | | | | | | | | | | When man-db runs under eatmydata on buster, it (at least sometimes) prints this message ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored. (This is #963508 which I have just filed against glibc.) Obviously it would be better if this just worked, but for now we can definitely ignore this as it doesn't represent a bug in src:dgit's manpages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: Provision for always-expected msgsIan Jackson2020-06-22
| | | | | | Currently there are none, so no functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix upstream_commitish_search APIIan Jackson2020-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | upstream_commitish_search used to return a commit. If it succeeded The caller could find the tag in $tried[-1]. Both callers relied on this unpleasant and error-prone API. In 0bb8e2a87e3c8b5be0fce5c2491b292e9273056e Dgit::upstream_commitish_search: fail if more than one tag exists the algorithm was changed to keep looking, so it can reject ambiguous situations. The result is that $tried[-1] is entirely wrong in the success case. (This is spotted by the tagupl-baredebian test.) It would have been possible to fix this by making upstream_commitish_search synthesise a suitable return value for putting in $tried, but that is absurd. Instead give this function a sensible calling convention. It now returns a list of the tag name (for messages etc.) and the commitish (for use). Change both call sites. CC: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Rename a variable $ups_tag to $ups_revIan Jackson2020-06-22
| | | | | | | This is a commit, not a tag. This is prepping for a change where the tag will be here in a variable too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: UpdateSean Whitton2020-05-27
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* Dgit::upstream_commitish_search: fail if more than one tag existsSean Whitton2020-05-27
| | | | | | | | | We should not assume we know which the user wants to merge, as git-deborig does not. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Reported-by: David Bremner <bremner@debian.org> Reviewed-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Drop bad advice about upstream/ tag caseSean Whitton2020-05-27
| | | | | | | | | | | | | The first argument to the new-upstream subcommand is a version number, not a tag name, so this instruction could never have been correct. The user should not need usually to pass both the upstream version number and the upstream/ tag name, either, because git-debrebase should find it for them. Reported-by: David Bremner <bremner@debian.org> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Start 9.11Ian Jackson2020-02-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 09:33:11 +0000