Hi, On Tue, Apr 03, 2018 at 08:52:06AM +0200, Didier 'OdyX' Raboud wrote: > Le mardi, 7 novembre 2017, 10.00:01 h CEST Guido Günther a écrit : > > Can you point me to a repo where I can reproduce this? > > I just did that: > > git clone https://salsa.debian.org/printing-team/cups.git > cd cups > # Let the upstream/latest branch exist > git checkout upstream/latest > # Put debian/master to a commit that triggers the bug > git checkout debi an/master > git reset --hard 7210eeb6f1d0d99cb008a4567127b7762a29f5a7 > gbp dch --release --verbose
I can reproduce with that, thanks! The issue is $ 'git' 'describe' '--match' 'upstream/*' '--abbrev=0' '7210eeb6f1d0d99cb008a4567127b7762a29f5a7' warning: tag 'upstream/2.2.6' is externally known as 'v2.2.6' v2.2.6-4879-g7210eeb6f1d0d99cb008a4567127b7762a29f5a7 There's a long explanation how this comes about: https://github.com/git/git/commit/ff165f00c1065d94c0bcab8708364e6dc5655f5d I changed the code to not crash on that anymore. Cheers, -- Guido > gbp:debug: ['git', 'rev-parse', '--show-cdup'] > gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] > gbp:debug: ['git', 'rev-parse', '--git-dir'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/debian/master'] > gbp:debug: ['git', 'tag', '-l', 'debian/2.2.7-1'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'debian/2.2.7-1^0'] > gbp:info: Found tag for topmost changelog version > '46e03e2adff54390721b1a725ab9a6472e2cba39' > gbp:debug: ['git', 'log', '--pretty=format:%H', > '46e03e2adff54390721b1a725ab9a6472e2cba39..HEAD', '--no-merges', '--'] > gbp:debug: ['git', 'merge-base', 'HEAD', 'upstream/latest'] > gbp:debug: ['git', 'describe', '--match', 'upstream/*', '--abbrev=0', > '18a1649286d8978552c6334934a23dc6efe5fc0d'] > gbp:debug: Found upstream version None. > gbp:debug: /usr/bin/dpkg ['--compare-versions'] [None, 'lt', '2.2.7-1'] > > The temporary workaround is to run: > $ git branch -d upstream/latest
