[git-buildpackage] Is there a way to manually reconstruct the upstream branch if it diverged?

[Guido Günther]

Hi,
On Fri, Oct 24, 2025 at 09:13:57PM +0200, Markus Blatt wrote:
> Hi,
> 
> I must have somehow messed up my local upstream branch before running "gbp import --uscan".
> I think I did a "git reset --hard" with a wrong earlier commit and lost at least one tag on the upstream
> branch

"git reflog"

apart from that if you have the "lost" commits on the remote you can
just fetch that and rebase (after all it's a git branch like any other)

Cheers,
 -- Guido

> 
> Unfortunately, I only noticed this after uploading the new version to unstable when I ran gbp push.
> It failed because the remote and local upstream branches aree diverged.
> 
> The current status is
> - pristine-tar branch has the last tarball and is pushed
> - master branch (which holds the status for Debian unstable), has the tag for the last uploaded Debian release.
> - local upstream branch has diverged from origin/upstream.
> 
> Is there a good way to manually fix my local upstream branch and push?
> 
> Thanks a lot for your help.
> 
> Best,
> 
> Markus
> 
> 
> 
> _______________________________________________
> git-buildpackage mailing list
> git-buildpackage at lists.sigxcpu.org
> http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
>