From: Junio C Hamano <firstname.lastname@example.org> To: Johannes Schindelin <Johannes.Schindelin@gmx.de> Cc: Kevin Daudt <email@example.com>, firstname.lastname@example.org, J Wyman <email@example.com> Subject: Re: [PATCH v2 2/3] for-each-ref: let upstream/push optionally remote ref name Date: Mon, 16 Oct 2017 10:50:16 +0900 Message-ID: <firstname.lastname@example.org> (raw) In-Reply-To: <alpine.DEB.18.104.22.1680151804060.40514@virtualbox> (Johannes Schindelin's message of "Sun, 15 Oct 2017 18:05:35 +0200 (CEST)") Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: >> >> -Also respects `:remotename` to state the name of the *remote* instead of >> >> -the ref. >> >> +Also respects `:remotename` to state the name of the *remote* instead >> >> +of the ref, and `:remoteref` to state the name of the *reference* as >> >> +locally known by the remote. >> > >> > What does "locally known by the remote" mean in this sentence? >> >> Good question. I cannot offhand offer a better and concise >> phrasing, but I think can explain what it wants to describe ;-). > > Yep, described it well. > > Maybe "and `:remoteref` to state the name by which the remote knows the > *reference*"? I dunno. The original and your update both seem to come from a worldview where there is a single conceptual thing called "reference" that is shared between our repository and the remote repository we pull from (or push to), and the name we call it is "refs/remotes/origin/devel" while the name they use to call it is "refs/heads/devel". If you subscribe to that worldview, then the updated sentence might make it clearer than the original. But I do not share that worldview, and I am not sure (note: I am truly unsure---it's not like I am convinced it is a good idea but sugarcoating my expression, at least in this case) if subscribing to the worldview helps users' understanding. In my view "refs/remotes/origin/devel" is a reference we use to keep track of (or "a reference that corresponds to") the reference they have called "refs/heads/devel" at the remote, and these are two separate entities, so it's not like "this single thing is called differently by us and them". Stepping back a bit; here is how the description begins. upstream:: The name of a local ref which can be considered ``upstream'' from the displayed ref. So 'upstream' is like 'refs/remotes/origin/devel' in the example in the message you are responding to. Perhaps we can make it clear in the description, and then add :remote* modifiers are about asking where that remote-tracking branch comes from. For example, instead of these "Also respects...", something like: For a %(upstream) that is a remote-tracking branch, the name of the remote repository it is copied from can be obtained with %(upstream:remotename). Simiarly, the branch at the remote repository whose tip is copioed to this remote-tracking branch can be obtined with %(upstream:remoteref) as a full refname. may reduce the chance of confusion?
next prev parent reply index Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-02 13:56 [PATCH 0/3] for-each-ref: add :remote-ref and :remote-name specifiers Johannes Schindelin 2017-10-02 13:56 ` [PATCH 1/3] for-each-ref: let upstream/push optionally report the remote name Johannes Schindelin 2017-10-04 7:14 ` Junio C Hamano 2017-10-04 9:08 ` Junio C Hamano 2017-10-05 12:20 ` Johannes Schindelin 2017-10-02 13:57 ` [PATCH 2/3] for-each-ref: let upstream/push optionally report merge name Johannes Schindelin 2017-10-04 9:12 ` Junio C Hamano 2017-10-04 11:41 ` Junio C Hamano 2017-10-05 9:14 ` Junio C Hamano 2017-10-02 13:57 ` [PATCH 3/3] for-each-ref: test :remote-name and :remote-ref Johannes Schindelin 2017-10-05 1:54 ` [PATCH 0/3] for-each-ref: add :remote-ref and :remote-name specifiers Junio C Hamano 2017-10-05 12:19 ` [PATCH v2 0/3] for-each-ref: add :remoteref and :remotename specifiers Johannes Schindelin 2017-10-05 12:19 ` [PATCH v2 1/3] for-each-ref: let upstream/push optionally report the remote name Johannes Schindelin 2017-10-10 9:35 ` Junio C Hamano 2017-10-11 2:07 ` Junio C Hamano 2017-10-05 12:19 ` [PATCH v2 2/3] for-each-ref: let upstream/push optionally remote ref name Johannes Schindelin 2017-10-06 5:10 ` Junio C Hamano 2017-10-11 5:58 ` Junio C Hamano 2017-10-12 19:13 ` Johannes Schindelin 2017-10-13 0:30 ` Junio C Hamano 2017-10-15 16:02 ` Johannes Schindelin 2017-10-13 16:39 ` Kevin Daudt 2017-10-14 2:08 ` Junio C Hamano 2017-10-15 16:05 ` Johannes Schindelin 2017-10-16 1:50 ` Junio C Hamano [this message] 2017-10-16 11:39 ` Johannes Schindelin 2017-10-05 12:19 ` [PATCH v2 3/3] for-each-ref: test :remotename and :remoteref Johannes Schindelin 2017-11-07 16:30 ` [PATCH v3 0/3] for-each-ref: add :remoteref and :remotename specifiers Johannes Schindelin 2017-11-07 16:30 ` [PATCH v3 1/3] for-each-ref: let upstream/push optionally report the remote name Johannes Schindelin 2017-11-07 16:31 ` [PATCH v3 2/3] for-each-ref: let upstream/push report the remote ref name Johannes Schindelin 2017-11-07 16:31 ` [PATCH v3 3/3] for-each-ref: test :remotename and :remoteref Johannes Schindelin 2017-11-08 1:36 ` [PATCH v3 0/3] for-each-ref: add :remoteref and :remotename specifiers 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 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 \ --email@example.com \ --firstname.lastname@example.org \ --cc=Johannes.Schindelin@gmx.de \ --email@example.com \ --firstname.lastname@example.org \ --email@example.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
firstname.lastname@example.org list mirror (unofficial, one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Example config snippet for mirrors Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ AGPL code for this site: git clone https://public-inbox.org/public-inbox.git