Subject: Re: Git rebase no longer defaults to upstream after force push

From: Felipe Contreras <[email-masked]>
Date: Tue, 18 Apr 2023 18:06:29 -0600

Erik Cervin Edin wrote:
> Thank you for filling out a Git bug report!
> Please answer the following questions to help us understand your issue.
> 
> What did you do before the bug happened? (Steps to reproduce your issue)
> 
>   git init --bare foo.git && git clone foo.git/ foo && cd foo
>   touch bar && git add bar && git commit -m init
>   git push -u
>   git switch -c a
>   seq 1 3 > bar && git add bar && git commit -m 1
>   git push

For me it fails at this point.

  fatal: The upstream branch of your current branch does not match
  the name of your current branch.  To push to the upstream branch
  on the remote, use

      git push . HEAD:master

  To push to the branch of the same name on the remote, use

      git push . HEAD

  To choose either option permanently, see push.default in 'git help config'.

  To avoid automatically configuring an upstream branch when its name
  won't match the local branch, see option 'simple' of branch.autoSetupMerge
  in 'git help config'.

What's your configured push.default?

>   seq 11 13 > bar && git add bar && git commit -m 2
>   git rebase -ir # Works like git rebase -ir @{upstream}
>   git push --force origin main:a
>   git rebase -ir # No longer works like git rebase -ir @{upstream}

This works fine here.

-- 
Felipe Contreras