From: "Jakub Narębski" <jnareb@gmail.com>
To: Phil Hord <phil.hord@gmail.com>, Git <git@vger.kernel.org>
Subject: Re: git-push branch confusion caused by user mistake
Date: Sat, 11 Mar 2017 21:43:34 +0100 [thread overview]
Message-ID: <4a60d43b-b4b2-fb8d-b139-bbbdef564187@gmail.com> (raw)
In-Reply-To: <CABURp0pf=4BE=E7qeOmYAcqJb=qDeGJ1EFyfCf+hDtKjjMD=ng@mail.gmail.com>
W dniu 10.03.2017 o 22:44, Phil Hord pisze:
> This week a user accidentally did this:
>
> $ git push origin origin/master
> Total 0 (delta 0), reused 0 (delta 0)
> To parent.git
> * [new branch] origin/master -> origin/master
>
> He saw his mistake when the "new branch" message appeared, but he was
> confused about how to fix it and worried he broke something.
It is nowadays very easy to delete accidentally created remote branch
with
$ git push origin --delete origin/master
> It seems reasonable that git expanded the original args into this one:
>
> git push origin refs/remotes/origin/master
>
> However, since the dest ref was not provided, it was assumed to be the
> same as the source ref, so it worked as if he typed this:
>
> git push origin refs/remotes/origin/master:refs/remotes/origin/master
This rule depends on push.default setting, but it is a very simple
rule. Simple is good. DWIM is usually not worth it, unless program
can guess what you meant, and what you meant is always the same.
> I think git should be smarter about deducing the dest ref from the
> source ref if the source ref is in refs/remotes, but I'm not sure how
> far to take it. It feels like we should translate refspecs something
> like this for push:
>
> origin/master
> => refs/remotes/origin/master:refs/heads/master
[...]
Such push doesn't make sense (unless you have a quite unusual situation).
Note that 'origin/master', that is 'refs/remotes/origin/master' is a
remote-tracking branch, that is a ref that is meant to track position
of the 'master' branch ('refs/heads/master') in the 'origin' remote.
Thus it should always be the same as 'master' in 'origin', or be behind
if you didn't fetch.
> Does this seem reasonable? I can try to work up a patch if so.
Thus I don't think such complication is reasonable.
--
Jakub Narębski
prev parent reply other threads:[~2017-03-11 20:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 21:44 git-push branch confusion caused by user mistake Phil Hord
2017-03-10 22:13 ` Junio C Hamano
2017-03-13 8:54 ` Jacob Keller
2017-03-13 19:49 ` Phil Hord
2017-03-11 20:43 ` Jakub Narębski [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
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=4a60d43b-b4b2-fb8d-b139-bbbdef564187@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=phil.hord@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).