Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.bugs.dist > #1246400

Bug#1105759: git-debpush upstream tag confusion

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Package: git-debpush
Version: 12.12
Severity: wishlist

I got this error:

jas@kaka:~/dpkg/git2cl$ git debpush --gbp --tag-only
tags upstream/3.0, v3.0 all exist in this repository
tell me which one you want to make an orig.tar from: git deborig --just-print '--version=1:3.0-3' TAG
git-debpush: git-deborig failed; maybe try git-debpush --upstream=TAG
jas@kaka:~/dpkg/git2cl$ 

The message is correct, but I don't understand why it is confused by the
unrelated v3.0 tag.

jas@kaka:~/dpkg/git2cl$ cat debian/gbp.conf 
[DEFAULT]
debian-branch   = debian/latest
upstream-branch = upstream/latest
pristine-tar    = True
jas@kaka:~/dpkg/git2cl$ 

I thought gbp defaults where to use upstream/* so v3.0 doesn't match here:

       --upstream-tag=tag-format
              Use  this  tag format when tagging upstream versions, default is
              upstream/%(version)s.

Here is my upstream branch:

jas@kaka:~/dpkg/git2cl$ git log -1 upstream/latest 
commit b2866e9a66b43855a37e462d17a8ba1ca3c51d90 (tag: upstream/3.0, origin/upstream/latest, jas/upstream/latest, upstream/latest)
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Oct 9 15:56:31 2024 +0200

    New upstream version 3.0
jas@kaka:~/dpkg/git2cl$ 

The v3.0 tag is coming from my upstreamvcs remote:

jas@kaka:~/dpkg/git2cl$ git remote -v
dgit	
jas	git@salsa.debian.org:jas/git2cl.git (fetch)
jas	git@salsa.debian.org:jas/git2cl.git (push)
origin	git@salsa.debian.org:debian/git2cl.git (fetch)
origin	git@salsa.debian.org:debian/git2cl.git (push)
upstreamvcs	https://git.savannah.gnu.org/git/git2cl.git (fetch)
upstreamvcs	https://git.savannah.gnu.org/git/git2cl.git (push)
jas@kaka:~/dpkg/git2cl$ git log -1 upstreamvcs/master 
commit 78455e00db59155469212fecae1362be00eb8754 (tag: v3.0, tag: git2cl-3.0, upstreamvcs/master)
Author: Simon Josefsson <simon@josefsson.org>
Date:   Wed Oct 9 15:16:43 2024 +0200

    Fix git2cl POD doc.
    
    Reported by Reuben Thomas <rrt@sc3d.org> in
    https://savannah.nongnu.org/bugs/?40235
jas@kaka:~/dpkg/git2cl$ 

FWIW, this is a really nit-pick user experience bug report -- feel free
to close if it is hard to solve.  The workaround is trivial:

git debpush --gbp --tag-only --upstream=upstream/3.0

/Simon

Back to linux.debian.bugs.dist | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Bug#1105759: git-debpush upstream tag confusion Simon Josefsson <simon@josefsson.org> - 2025-05-14 16:00 +0200
  Bug#1105759: git-debpush upstream tag confusion Simon Josefsson <simon@josefsson.org> - 2025-05-14 16:20 +0200
    Bug#1105759: git-debpush upstream tag confusion Sean Whitton <spwhitton@spwhitton.name> - 2025-05-14 16:40 +0200
      Bug#1105759: git-debpush upstream tag confusion Ian Jackson <ijackson@chiark.greenend.org.uk> - 2025-05-14 16:50 +0200
  Bug#1105759: git-debpush upstream tag confusion Ian Jackson <ijackson@chiark.greenend.org.uk> - 2025-05-14 16:20 +0200
  Bug#1105759: git-debpush upstream tag confusion Ian Jackson <ijackson@chiark.greenend.org.uk> - 2025-05-14 16:40 +0200
    Bug#1105759: git-debpush upstream tag confusion Sean Whitton <spwhitton@spwhitton.name> - 2025-05-14 16:50 +0200

csiph-web