From: Junio C Hamano <junkio@cox.net>
To: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC] Convenient support of remote branches in git-checkout
Date: Mon, 06 Nov 2006 18:27:27 -0800 [thread overview]
Message-ID: <7vvels6lf4.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200611070225.24956.Josef.Weidendorfer@gmx.de> (Josef Weidendorfer's message of "Tue, 7 Nov 2006 02:25:24 +0100")
Josef Weidendorfer <Josef.Weidendorfer@gmx.de> writes:
>> Then "git checkout origin/next" would always mean "I want to
>> switch to the branch I use to hack on the branch 'next' Junio
>> has". Do it once and you will get exactly my tip, hack on it,
>> switch out of it and then do it again and you won't lose your
>> previous work but just switch to that branch.
>
> Ah, now I understand your thinking.
> I admit it has a compelling elegance.
>
> However.
> Would it not be confusing for newbies (and not only for them) to
> first reference the remote branch with "origin/next", and afterwards, you
> get your own development branch by using the exactly same name?
When we get these per-branch attributes used widely enough, we
might add new vocabulary to our extended sha1 expressions that
denotes "the branch I forked this branch off of".
If refs/heads/next is created from refs/remotes/origin/next,
perhaps with an updated git-branch command that knows how to
help set things up, we might want to be able to refer to
remotes/origin/next as "next's upstream". While we are on
'next' branch, we might want to refer to "HEAD's upstream".
I am not sure what the syntax for that should be, though.
Perhaps "HEAD@upstream"?
Unlike the regular extended sha1 expression modifiers such as
name~n, name^n, and name^{type}, it does not work with arbitrary
object name; it can only work with a refname. Which is similar
to the '@{time}' notation we added when we started using
ref-log. Strictly speaking these should not belong to the sha1
naming layer, but we can have them anyway for the user's
convenience.
next prev parent reply other threads:[~2006-11-07 2:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-06 23:26 [PATCH/RFC] Convenient support of remote branches in git-checkout Josef Weidendorfer
2006-11-06 23:30 ` Josef Weidendorfer
2006-11-07 0:13 ` Junio C Hamano
2006-11-07 1:25 ` Josef Weidendorfer
2006-11-07 2:03 ` Junio C Hamano
2006-11-07 2:08 ` Junio C Hamano
2006-11-07 10:18 ` Josef Weidendorfer
2006-11-07 2:27 ` Junio C Hamano [this message]
2006-11-07 10:28 ` Josef Weidendorfer
2006-11-07 6:54 ` Karl Hasselström
2006-11-07 10:53 ` Josef Weidendorfer
2006-11-07 13:56 ` Karl Hasselström
2006-11-07 17:04 ` Josef Weidendorfer
2006-11-07 7:07 ` Junio C Hamano
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=7vvels6lf4.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Josef.Weidendorfer@gmx.de \
--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