vcswatch reports that
this package seems to have a new changelog entry (version
9.13~, distribution
unstable) and new commits
in its VCS. You should consider whether it's time to make
an upload.
Here are the relevant commit messages:
commit 5f3829fa38fa736af588fa166f4fada4a7a6f86e
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed Aug 19 17:27:45 2020 +0100
changelog: start 9.13
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit bfe3a2708864b9080a0fd51862a187df58fb62ea
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed Aug 19 17:25:51 2020 +0100
changelog: finalise 9.12
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit d338da6ea79f0115a9617230c7526c9ea217d745
Author: Sergio Durigan Junior <sergiodj@debian.org>
Date: Wed Aug 19 16:46:16 2020 +0100
dgit-mirror-ssh-wrap: Cope with yet another new rsync rune.
Closes:#968635.
Signed-off-by: Sergio Durigan Junior <sergiodj@debian.org>
commit 03f224b7dd9343ef6d595739be815f2f2aa65048
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 19:10:27 2020 +0100
changelog: start 9.12
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit a3e3cee19ca291132ce18ab6556d40b26893e8c8
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 19:09:22 2020 +0100
changelog: finalise 9.11
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 0bb734e1ddc369763af4f00d73cbd8181757c66b
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 19:09:01 2020 +0100
changelog: update for further changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 0e66721f92075fdd312de17531c6c9175c674ed3
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 17:07:47 2020 +0100
dgit-mirror-ssh-wrap: Cope with new rsync rune
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>
commit 375416205ac9263c07b615d5ee7aa374b263a9e7
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 17:06:52 2020 +0100
dgit-mirror-ssh-wrap: Fix syntax for multiple patterns
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>
commit 0485d821f0e4ec4f13192e3de6747087ece3aae1
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 17:03:32 2020 +0100
dgit-mirror-ssh-wrap: Clarify the error message
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>
commit 2b693260e2b5d6aedd994e934e5a5c07b72fd655
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue Feb 4 10:42:37 2020 +0000
git-debrebase(1): Fix new-upstream -i docs
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>
commit eea63cb780fdd178a708d1993d2563597a15b117
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue Feb 4 10:38:31 2020 +0000
git-debrebase: new-upstream: Do not treat late options as version
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>
commit 53ed7494028990bcfc7ddd778ed264ad7348624e
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue Feb 4 10:25:07 2020 +0000
git-debrebase: Fix error message for wrong use of -i
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>
commit a1f11a98f79b9a907a5f48e108f0c794a4a500cb
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue Apr 28 12:27:23 2020 +0100
tests: Print pwd in failure trap
This will help debugging.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 21c4372e7b80a1e2c62d1c969f3ca308e131eb5e
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri Mar 27 22:16:03 2020 +0000
test suite: Provide navigation banner when exiting nonzero
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit ecff6a6f7c990dc6c33d8f5aade6e6d95f5ee066
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 15:31:27 2020 +0100
test suite: manpages-format: Cope with buster & eatmydata
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>
commit e772b73b5b4d40e91a525c0a03dc89c7a14eb05f
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 15:29:42 2020 +0100
test suite: manpages-format: Provision for always-expected msgs
Currently there are none, so no functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit cf46ae056b60535bb6668faa9d0bd7ea1d33dba1
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 16:09:15 2020 +0100
Fix upstream_commitish_search API
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>
commit 357fe8157dd06aad0e998a37f6cdb3c582ee5be0
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Jun 22 16:05:37 2020 +0100
git-debrebase: Rename a variable $ups_tag to $ups_rev
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>
commit 080a2d0f60f0f8dd7b7e2d93e43ed92f8ade4eff
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed May 27 18:00:10 2020 -0700
changelog: Update
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
commit 0bb8e2a87e3c8b5be0fce5c2491b292e9273056e
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed May 27 13:49:07 2020 -0700
Dgit::upstream_commitish_search: fail if more than one tag exists
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>
commit f72c5db7d8b587facc24999af1d2fd03f2026d1a
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed May 27 13:57:47 2020 -0700
dgit-maint-debrebase(7): Drop bad advice about upstream/ tag case
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>
commit d12484c1ff2e57d1bf6f0ad5f9604fa4059ffa6d
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Feb 3 08:55:40 2020 +0000
changelog: Start 9.11
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 4f41d991f1343912b5bd704be1e1cbb1ace52dba
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon Feb 3 08:41:23 2020 +0000
changelog: Finalise 9.10
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 635b2a6e7d55503a75ace034d96326d5b2197798
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun Feb 2 16:55:52 2020 +0000
changelog: Document changes so far since 9.9
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 9bdd848102280e5f633db852c1b15ff27716c1c0
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun Feb 2 16:50:41 2020 +0000
i18n-commit - autogenerated
commit 0193f7cd974e8c4a15a41d26b8a43c8f9fcb79b7
Author: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>
Date: Sun Feb 2 16:48:50 2020 +0000
i18n: Updated nl.po file
Closes: #945356
commit bc83ffe7319cab9f1b76b47de9426340836872fe
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu Jul 25 07:03:36 2019 +0100
dgit-maint-debrebase(7): Import tarball before committing gbp.conf
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>
commit 8f086237a8e78c4bd7d018f70818092eb27a5440
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed Jul 24 20:08:23 2019 +0100
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf
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>
commit 22c53928460b993bddadb72e8fd51dd916e29cfc
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed Jul 24 20:05:34 2019 +0100
d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in gbp.conf
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>
commit 3c8aa06111f498377f39f0f0d34d17fe7e187448
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun Feb 2 16:40:09 2020 +0000
dgit(1): Do not talk about `intermediate' uploads
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>
commit 60bbeaf9fb39b5d8d73ae3cf309ff29e8b705af3
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Sep 5 11:26:16 2019 +0100
Terminology: Change "rewind" to "rewrite" where appropriate
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>
commit 209b87ba971701dffcd97a7fd9593cea51f62000
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu Sep 5 11:21:35 2019 +0100
dgit(1): Cover more cases of --overwrite and --deliberately
Closes: #928473
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit 70df464217c2b96ea481cb3b28210b53a2d7e040
Author: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat Oct 19 10:33:10 2019 -0700
git-debpush: avoid a pipefail problem in get_file_from_ref
`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>
commit 134addbf3309871ef36016dd136c362b9cade482
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun Feb 2 12:34:04 2020 +0000
tests: import-dsc: Test corrupted ENV (#950446)
Closes: #950326
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
commit ccebebe13a570e7432416817f09306e068928e96
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat Feb 1 21:12:25 2020 +0000
dgit: absurd: Work around mangled env metadata from gbp
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>
commit 0bbccf3893a0c5a2ce38bb0d9c5ce3e975ae1775
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat Feb 1 21:08:02 2020 +0000
dgit: absurd: Break out PATH filtering
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>
commit ece5816db28a48e097d99da1bfaf4d853726b851
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat Feb 1 21:04:56 2020 +0000
dgit: absurd: Provide a way for absurd git to print warnings
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>
commit 524d221c7e3b70db546be01d4929a1e9a56e14b7
Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat Sep 14 21:37:15 2019 +0100
changelog: start 9.10
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
![[bug history graph]](https://qa.debian.org/data/bts/graphs/d/dgit.png){kind=link}