Control: clone -1 -2
Control: retitle -2 git-debpush --branch, rename option to be less attractive?
Control: retitle -1 git-debpush should detect a dirty git tree
Control: severity -1 important
Marco d'Itri writes ("Bug#1108088: should check that the changelog version
matches the tag version"):
> But I see the reason for my confusion now: debian/experimental is
> branched off debian/unstable, so 7.7.0-3 is a branch in
> debian/experimental too and it matched the last changelog entry in the
> repository.
Right. git-debpush looks at debian/changelog to decide what to do.
> No, I meant to check that the tags that it creates and is trying to push
> matches the current version of the changelog. But my problem was that
> the changelog version on disk was different from the one in the
> repository (because I forgot to commit the changes)
So your git tree was dirty? You had edited d/changelog but not
committed? I'm surprised that git-debpush didn't object to this
situation...
... but it turns out it doesn't check for this. And it does its work
in a little private tree where it sees only committed git objects, so
it carried on in blissful ignorance.
Gosh. Well, we will fix that. Thanks for the report!
> In the end I am not sure anymore that there is much actionable here,
I think there are several things about your situation nwhere
git-debpush could have done better:
1. It ought to complain if your git tree is dirty. That nearly always
means you forgot to commit. In this case that meant it used the
version of d/changelog in HEAD rather than the one in your working
tree, which is definitely wrong.
(This bug, #1108088.)
2. I think maybe --branch ought to be called --other-branch or
--upload-other-branch or --look-only-at-other-branch or
--other-git-branch or something. Just --branch is too attractive a
name.
A user who is confused may use it in an effort to correct an apparent
misbehaviour, but in such a situation it's likely to make things worse
rather than better. (In your case it did nothing.) Some gbp tools
have --branch options which are much less exciting.
Another awkwardness with --branch is that some people might think it
referred to the target Debian release. (Eg when the BTS says "from
other branch bugs".) We call that a "suite". This option is about
the local branch to use as input, not where the output ends up.
Let's see what Sean thinks about this. (Bug clone -2, bug# TBD.)
3. git-debpush ought to avoid re-making an existing DEP-14 tag.
This is covered by #1107921, especially
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1107921
I'll write more there.
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
