From: Felipe Contreras <felipe.contreras@gmail.com>
To: Erik Cervin Edin <erik@cervined.in>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Git rebase no longer defaults to upstream after force push
Date: Tue, 18 Apr 2023 18:06:29 -0600 [thread overview]
Message-ID: <643f30851cd53_2217c42948e@chronos.notmuch> (raw)
In-Reply-To: <CA+JQ7M_KuDXBaVTzVwLTx+R4-6-3TOuUOpcchkS26iiosc85Hg@mail.gmail.com>
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
prev parent reply other threads:[~2023-04-19 0:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 9:17 Git rebase no longer defaults to upstream after force push Erik Cervin Edin
2023-04-18 14:01 ` Phillip Wood
2023-04-18 15:54 ` Cem Gündoğdu
2023-04-19 15:43 ` Erik Cervin Edin
2023-04-19 17:03 ` Sergey Organov
2023-04-19 0:06 ` Felipe Contreras [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=643f30851cd53_2217c42948e@chronos.notmuch \
--to=felipe.contreras@gmail.com \
--cc=erik@cervined.in \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox