summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: finalise 9.15debian/9.15archive/debian/9.15Ian Jackson2022-01-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changesIan Jackson2022-01-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Update all using tests/update-db-compatIan Jackson2022-01-02
| | | | | | Closes: #1002927. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Call git gcIan Jackson2022-01-02
| | | | | | | We want to pack everything down, as we're going to commit this stuff as tarballs into dgit's permanent history ! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Adjust worktrees too.Ian Jackson2022-01-02
| | | | | | Now all the tests pass even with the debhelper that doesn't support 5. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Strip all git-filter-branch original/ refsIan Jackson2022-01-02
| | | | | | | Apparently some of our trees have these already. This stops g-f-b from working. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Some more refactoringIan Jackson2022-01-02
| | | | | | Break out git_filter_strip_origs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Add a reassuring message.Ian Jackson2022-01-02
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Add filtering of git-srcsIan Jackson2022-01-02
| | | | | | Empirically, this fixes a few more tests, as expected. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: Some refactoringIan Jackson2022-01-02
| | | | | | | | | We want the tree adjustment to be first-class program so we can run it. Setting its name as a variable makes this easier, too. Also, now we keep $toplevel, we can use it in a couple of plaxes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests/update-db-compat: initial script to address dh compatIan Jackson2022-01-02
| | | | | | This fixes some tests already, if I run it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Use t-debchange in some places instead of dchIan Jackson2022-01-02
| | | | | | | | | | | | | Raw dch can hang reading stdin for confirmation because we forgot to set DEBEMAIL. Empirically it works some of the time. Maybe the parallel test ordering connects only some of the tests' stdin to the terminal, or something. Anyway, we have t-debchange and so we should be using it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tests: Set FILTER_BRANCH_SQUELCH_WARNING=1Ian Jackson2022-01-02
| | | | | | This gets rid of some pointless sleeps. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: pseudomerge_version_check: Check for unfinalised changelog entryIan Jackson2022-01-02
| | | | | | | | This detects the case where d/changelog contains an unfinalised entry for $v (the version being overwritten). (This could only happen if $v is not the first entry, so this changelog is quite badly wrong.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: pseudomerge_version_check: Move $vclogp scopeIan Jackson2022-01-02
| | | | | | NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 9.15Ian Jackson2021-09-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* 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>