From: Felipe Contreras <felipe.contreras@gmail.com>
To: Mathias Kunter <mathiaskunter@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org
Cc: "Elijah Newren" <newren@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Ramkumar Ramachandra" <r@artagnon.com>,
"Jeff King" <peff@peff.net>, "René Scharfe" <l.s.r@web.de>,
"Matthieu Moy" <git@matthieu-moy.fr>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v2 6/6] doc: push: explain default=simple correctly
Date: Mon, 31 May 2021 10:14:21 -0500 [thread overview]
Message-ID: <60b4fd4db5dee_24d282088c@natae.notmuch> (raw)
In-Reply-To: <3e5c2303-030e-928e-af57-8e2be8f3ce86@gmail.com>
Mathias Kunter wrote:
> Am 30.05.21 um 21:09 schrieb Felipe Contreras:
> >>> The current branch is pushed to the corresponding upstream branch, but
> >>> as a safety measure, the push is aborted if the upstream branch does not
> >>> have the same name as the local one.
> >
> > Except that isn't accurate.
> >
> > git clone $url
> > git checkout -b fix-1
> > # do commits
> > git push
> >
> > Does that push the current branch to the corresponding upstream branch?
>
> I see. Then maybe reword to something like this:
>
> > The current branch is pushed to a branch with the same name on the
> > remote, but as a safety measure, the push is aborted if a corresponding
> > upstream branch does not have the same name as the local one.
>
> In your above example, I'm in centralized workflow, but I can still push
> the fix-1 branch to origin without having to configure an upstream
> branch for it.
No, you can't:
% git push
fatal: The current branch fix-1 has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin fix-1
Isn't that problem the one you originally described [1]?
The behavior doesn't change if you don't specify the remote:
`git push` == `git push origin`.
> So this seems to contradict with the currently proposed
> wording:
>
> > If you are working on a centralized workflow, then you need to configure
> > an upstream branch with the same name.
My wording is correct, and that's precisely the problem.
Maybe you are thinking this patch series implements the fix I proposed:
it doesn't.
The two patch series merely reorganizes the code to make it simpler and
easier to understand. No functionality changes.
Cheers.
[1] https://lore.kernel.org/git/065528bf-b496-83d3-767d-2a78e50a9edf@gmail.com
--
Felipe Contreras
next prev parent reply other threads:[~2021-05-31 17:01 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-29 7:11 [PATCH v2 0/6] Unconvolutize push.default=simple Felipe Contreras
2021-05-29 7:11 ` [PATCH v2 1/6] push: hedge code of default=simple Felipe Contreras
2021-05-31 4:44 ` Junio C Hamano
2021-05-31 7:50 ` Felipe Contreras
2021-05-29 7:11 ` [PATCH v2 2/6] push: move code to setup_push_simple() Felipe Contreras
2021-05-31 5:04 ` Junio C Hamano
2021-05-31 8:03 ` Felipe Contreras
2021-05-29 7:11 ` [PATCH v2 3/6] push: reorganize setup_push_simple() Felipe Contreras
2021-05-31 5:04 ` Junio C Hamano
2021-05-29 7:11 ` [PATCH v2 4/6] push: simplify setup_push_simple() Felipe Contreras
2021-05-31 5:04 ` Junio C Hamano
2021-05-29 7:11 ` [PATCH v2 5/6] push: remove unused code in setup_push_upstream() Felipe Contreras
2021-05-29 7:11 ` [PATCH v2 6/6] doc: push: explain default=simple correctly Felipe Contreras
2021-05-30 18:19 ` Mathias Kunter
2021-05-30 19:09 ` Felipe Contreras
2021-05-31 7:12 ` Mathias Kunter
2021-05-31 15:14 ` Felipe Contreras [this message]
2021-05-31 16:54 ` Mathias Kunter
2021-05-31 17:31 ` Felipe Contreras
2021-05-31 18:38 ` Mathias Kunter
2021-05-31 21:15 ` Felipe Contreras
2021-05-31 21:54 ` Mathias Kunter
2021-05-31 5:14 ` Junio C Hamano
2021-05-31 8:11 ` Felipe Contreras
2021-06-01 9:44 ` Junio C Hamano
2021-06-01 12:12 ` Felipe Contreras
2021-06-01 15:57 ` Philip Oakley
2021-06-01 16:35 ` Felipe Contreras
2021-06-01 19:39 ` Philip Oakley
2021-06-01 23:53 ` Felipe Contreras
2021-06-01 19:34 ` Junio C Hamano
2021-05-29 7:44 ` [PATCH 00/15] push: revamp push.default Felipe Contreras
2021-05-29 7:44 ` [PATCH 01/15] push: create new get_upstream_ref() helper Felipe Contreras
2021-05-29 7:44 ` [PATCH 02/15] push: return immediately in trivial switch case Felipe Contreras
2021-05-29 7:44 ` [PATCH 03/15] push: reorder switch cases Felipe Contreras
2021-05-31 6:34 ` Junio C Hamano
2021-05-31 8:14 ` Felipe Contreras
2021-05-29 7:44 ` [PATCH 04/15] push: factor out null branch check Felipe Contreras
2021-05-29 7:44 ` [PATCH 05/15] push: only get the branch when needed Felipe Contreras
2021-05-31 6:44 ` Junio C Hamano
2021-05-31 8:16 ` Felipe Contreras
2021-05-29 7:44 ` [PATCH 06/15] push: make setup_push_* return the dst Felipe Contreras
2021-05-29 7:44 ` [PATCH 07/15] push: trivial simplifications Felipe Contreras
2021-05-29 7:44 ` [PATCH 08/15] push: get rid of all the setup_push_* functions Felipe Contreras
2021-05-31 6:44 ` Junio C Hamano
2021-05-29 7:44 ` [PATCH 09/15] push: factor out the typical case Felipe Contreras
2021-05-29 7:44 ` [PATCH 10/15] push: remove redundant check Felipe Contreras
2021-05-29 7:44 ` [PATCH 11/15] push: fix Yoda condition Felipe Contreras
2021-05-31 6:44 ` Junio C Hamano
2021-05-29 7:44 ` [PATCH 12/15] push: remove trivial function Felipe Contreras
2021-05-29 7:44 ` [PATCH 13/15] push: only get triangular when needed Felipe Contreras
2021-05-31 6:48 ` Junio C Hamano
2021-05-29 7:44 ` [PATCH 14/15] push: don't get a full remote object Felipe Contreras
2021-05-29 7:44 ` [PATCH 15/15] push: rename !triangular to same_remote Felipe Contreras
2021-05-31 7:54 ` Junio C Hamano
2021-05-29 20:37 ` [PATCH v2 0/6] Unconvolutize push.default=simple Philip Oakley
2021-05-30 16:27 ` Felipe Contreras
2021-05-30 11:31 ` Ævar Arnfjörð Bjarmason
2021-05-30 16:22 ` Felipe Contreras
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=60b4fd4db5dee_24d282088c@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=mathiaskunter@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=r@artagnon.com \
/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;
as well as URLs for NNTP newsgroup(s).