Hi, I'm trying to do a "gbp push" for a repo and it fails: hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ gbp push gbp:info: Pushing debian/0.7+git73896501cf-2 to origin gbp:info: Pushing upstream/0.7+git73896501cf to origin gbp:info: Pushing d8074c6b03512b4001b8e1ea06737afd989f139a to origin:refs/heads/master gbp:error: Error running git push: To salsa.debian.org:debian-proftpd-team/proftpd-mod-case.git ! [rejected] d8074c6b03512b4001b8e1ea06737afd989f139a -> master (non-fast-forward) error: failed to push some refs to 'salsa.debian.org:debian-proftpd-team/proftpd-mod-case.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. gbp:info: Pushing refs/heads/upstream to origin:refs/heads/upstream gbp:error: Failed to push some refs. I did the "git pull", which says "Already up to date.", but this did not solve the issue. How do I solve the issue? One note: when I tried to do the push for the first time it told me there would be no "upstream/0.7+git73896501cf" tag, which was correct. The person who did the upload for debian/0.7+git73896501cf-1 did not update the "upstream" branch, hence the tag was not created. I fixed the upstream branch by doing an "gpb import-orig". Now the "upstream/0.7+git73896501cf" tags is more recent than the "debian/0.7+git73896501cf-2" tag. Could this cause issues? https://salsa.debian.org/debian-proftpd-team/proftpd-mod-case/-/commits/master H. -- sigfault #206401 http://counter.li.org
Attachment:
signature.asc
Description: OpenPGP digital signature