From: Josh Steadmon <steadmon@google•com>
To: Tao Klerks <tao@klerks•biz>
Cc: "Tao Klerks via GitGitGadget" <gitgitgadget@gmail•com>,
git@vger•kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Eric Sunshine" <sunshine@sunshineco•com>
Subject: Re: [PATCH v4] merge: new autosetupmerge option 'simple' for matching branches
Date: Wed, 20 Apr 2022 10:19:02 -0700 [thread overview]
Message-ID: <YmBAhjR7rwAuHylN@google.com> (raw)
In-Reply-To: <CAPMMpogY5vZU8gyRSYh+BM4goPPtJw0cCiM-31sy-s_uGRv8uA@mail.gmail.com>
On 2022.04.20 07:12, Tao Klerks wrote:
> On Mon, Apr 18, 2022 at 8:15 PM Josh Steadmon <steadmon@google•com> wrote:
> > It seems appropriate to me to add one,
> > perhaps at the point where a user with "autosetupmerge=true" would run
> > into a failure when trying to push?
>
> Having thought about this a bit, I agree. On the one hand I'm a little
> nervous about adding this kind of public behavior change as I would
> imagine it's more likely to encounter resistance here, on the other
> hand I do think it will make the changes themselves much more useful.
> Also, this patchset hasn't moved in a while, so "holding it up" with
> new changes may not be a significant concern.
>
> the current advice looks something like:
> ---
> 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 origin HEAD:master
>
> To push to the branch of the same name on the remote, use
>
> git push origin HEAD
>
> To choose either option permanently, see push.default in 'git help config'.
> ---
>
> I would propose to add one sentence at the end along the lines of:
> ---
> To instead avoid automatically configuring upstream branches when
> their name doesn't match the local branch, see option 'simple' of
> branch.autosetupmerge in 'git help config'.
> ---
>
> Does that make sense to you?
Sounds good to me.
next prev parent reply other threads:[~2022-04-20 17:19 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-24 9:45 [PATCH 0/3] adding new branch.autosetupmerge option "simple" Tao Klerks via GitGitGadget
2022-02-24 9:45 ` [PATCH 1/3] merge: new autosetupmerge option 'simple' for matching branches Tao Klerks via GitGitGadget
2022-02-24 19:20 ` Junio C Hamano
2022-02-24 9:45 ` [PATCH 2/3] t3200: tests for new branch.autosetupmerge option "simple" Tao Klerks via GitGitGadget
2022-02-24 9:45 ` [PATCH 3/3] branch documentation: new autosetupmerge " Tao Klerks via GitGitGadget
2022-02-24 19:38 ` Junio C Hamano
2022-02-25 18:52 ` [PATCH v2 0/2] adding new branch.autosetupmerge " Tao Klerks via GitGitGadget
2022-02-25 18:52 ` [PATCH v2 1/2] merge: new autosetupmerge option 'simple' for matching branches Tao Klerks via GitGitGadget
2022-02-25 20:15 ` Junio C Hamano
2022-02-27 23:59 ` Tao Klerks
2022-02-25 18:52 ` [PATCH v2 2/2] t3200: tests for new branch.autosetupmerge option "simple" Tao Klerks via GitGitGadget
2022-02-28 7:14 ` [PATCH v3 0/2] adding " Tao Klerks via GitGitGadget
2022-02-28 7:14 ` [PATCH v3 1/2] merge: new autosetupmerge option 'simple' for matching branches Tao Klerks via GitGitGadget
2022-02-28 10:39 ` Ævar Arnfjörð Bjarmason
2022-03-02 9:35 ` Tao Klerks
2022-03-20 17:00 ` Tao Klerks
2022-02-28 7:14 ` [PATCH v3 2/2] t3200: tests for new branch.autosetupmerge option "simple" Tao Klerks via GitGitGadget
2022-02-28 9:34 ` Ævar Arnfjörð Bjarmason
2022-03-01 2:58 ` Eric Sunshine
2022-03-01 9:59 ` Tao Klerks
2022-03-01 9:59 ` Tao Klerks
2022-03-21 6:17 ` [PATCH v4] merge: new autosetupmerge option 'simple' for matching branches Tao Klerks via GitGitGadget
2022-04-18 18:15 ` Josh Steadmon
2022-04-20 5:12 ` Tao Klerks
2022-04-20 17:19 ` Josh Steadmon [this message]
2022-04-20 17:43 ` Junio C Hamano
2022-04-20 21:31 ` Tao Klerks
2022-04-21 1:53 ` Junio C Hamano
2022-04-21 10:04 ` Tao Klerks
2022-04-22 2:27 ` Junio C Hamano
2022-04-22 9:24 ` Tao Klerks
2022-04-22 13:27 ` Tao Klerks
2022-04-23 4:44 ` Junio C Hamano
2022-04-24 11:57 ` Tao Klerks
2022-04-29 7:31 ` Tao Klerks
2022-04-29 9:56 ` [PATCH v5 0/3] New options to support "simple" centralized workflow Tao Klerks via GitGitGadget
2022-04-29 9:56 ` [PATCH v5 1/3] branch: new autosetupmerge option 'simple' for matching branches Tao Klerks via GitGitGadget
2022-04-29 9:56 ` [PATCH v5 2/3] push: default to single remote even when not named origin Tao Klerks via GitGitGadget
2022-04-29 9:56 ` [PATCH v5 3/3] push: new config option "push.autoSetupRemote" supports "simple" push Tao Klerks via GitGitGadget
2022-04-29 18:50 ` [PATCH v5 0/3] New options to support "simple" centralized workflow Junio C Hamano
2022-04-30 15:48 ` Tao Klerks
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=YmBAhjR7rwAuHylN@google.com \
--to=steadmon@google$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tao@klerks$(echo .)biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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