From: Felipe Contreras <felipe.contreras@gmail.com>
To: Mathias Kunter <mathiaskunter@gmail.com>,
Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git push doesn't use local branch name as default
Date: Fri, 28 May 2021 12:52:01 -0500 [thread overview]
Message-ID: <60b12dc1f19b1_5190820879@natae.notmuch> (raw)
In-Reply-To: <f9f38d42-2b93-0d3b-798b-4c6f44eb111d@gmail.com>
Mathias Kunter wrote:
> > you only get the "current" behavior when fetch_remote is non-NULL.
>
> Well, then my suggestion actually is to also use the `current` behavior
> when fetch_remote is NULL - i.e. change
>
> > return (fetch_remote && fetch_remote != remote);
>
> to
>
> > return (!fetch_remote || fetch_remote != remote);
It's not quite that easy. You need to see the context of that code:
static int is_workflow_triangular(struct remote *remote)
{
struct remote *fetch_remote = remote_get(NULL);
return (fetch_remote && fetch_remote != remote);
}
That would affect many pathways.
> I'd argue that if `simple` pushing is used, then the expected behavior
> of the command
>
> > git push <remote_name>
>
> on a branch without upstream would actually be to use the `current`
> behavior instead of bailing out with an error.
I agree, but this mis-mash of modes makes the logic very hard to see.
I'll send patches to cleanup the logic, it makes no sense to have a
frankenstein of two modes and that is in fact the default mode. The
logic of the default mode should be crystal clear.
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2021-05-28 17:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <3b9bc214-a30a-ba49-af96-7eeaf37b7bbd@gmail.com>
2021-05-28 6:29 ` git push doesn't use local branch name as default Mathias Kunter
2021-05-28 7:00 ` Elijah Newren
2021-05-28 7:44 ` Mathias Kunter
2021-05-28 8:51 ` Mathias Kunter
2021-05-28 21:12 ` git push default doesn't make sense Felipe Contreras
2021-05-30 16:28 ` Mathias Kunter
2021-05-30 16:32 ` Felipe Contreras
2021-05-28 17:52 ` Felipe Contreras [this message]
2021-05-28 17:22 ` git push doesn't use local branch name as default Felipe Contreras
2021-05-28 17:44 ` Elijah Newren
2021-05-28 18:58 ` Felipe Contreras
2021-05-28 17:10 ` Felipe Contreras
2021-05-27 17:06 Mathias Kunter
2021-05-27 19:51 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60b12dc1f19b1_5190820879@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=mathiaskunter@gmail.com \
--cc=newren@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).