Hi!

I ran to this same error multiple times in past months when reviewing
Merge Requests about new upstream imports, and the submitter having
wrong/extra tags in their fork.

I see the error when I run the git fetch manually with `--quit` omitted:

± gbp pull --verbose --force twrightsman
gbp:info: Fetching from 'twrightsman'
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/latest']
gbp:debug: ['git', 'status', '--porcelain']
gbp:debug: ['git', 'fetch', '--quiet', 'twrightsman']
gbp:debug: ['git', 'fetch', '--quiet', '--tags', 'twrightsman']
gbp:error: Error running git fetch:

± git fetch --tags twrightsman
>From https://salsa.debian.org/twrightsman/godot
 ! [rejected]                upstream/4.3+ds   -> upstream/4.3+ds
(would clobber existing tag)
 ! [rejected]                upstream/4.4.1+ds -> upstream/4.4.1+ds
(would clobber existing tag)

Arnaud's commit
https://salsa.debian.org/arnaudr/git-buildpackage/-/commit/8f10840587e05b27ee43fbff10480ef2734805bb
makes sense to me.

Maybe you can submit it as a MR at
https://salsa.debian.org/agx/git-buildpackage/-/merge_requests now
that is an option?

Reply via email to