git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv2 3/3] branch: deprecate --set-upstream and show help if we detect possible mistaken use

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 23, 2012, 21:16 UTC
Message-ID
<7vtxvt2ts6.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1345748186-1081-1-git-send-email-cmn@elego.de>
Carlos Martín Nieto <cmn@elego.de> writes:
> The 'track' in the message is still not great, but it does fit with
> the one above. Maybe if we make it say "If youw wanted [...] track the
> remote-tracking branch 'origin/master'" it would be clearer?

The verb "track" in the phrase "remote-tracking branch" means "keep track of the branch at the remote, by storing a copy of the last observed state of it". In the same sentence, the verb "track" elsewhere is used to describe what the branch B whose upstream is set to B@{upstream} does against B@{upstream}, but that is not "keeping a copy"---it is doing an entirely different thing.

If we say that the branch B whose upstream is set to B@{upstream} is "building on top of B@{upstream}", "integrating with B@{upstream}", "forked from B@{upstream}", etc., without using the verb "track" that already means something else (i.e. keeps track of the copy of last observed state), it would reduce the confusion, but I do not think it would clarify anything if the verb "track" is used for that.

As usual, because I am not the best source of phrasing, others may find a better verb than "builds", "forks", or "integrates", though.

> I've simplified and tightened the logic. Now it will only show the
> undo message if the branch didn't exist locally and there is a
> remote-tracking branch of the same name.

The updated and simplified logic reads quite straight-forward, and looks good. It is likely that the message will be reworded and also localized in the future, so it would make sense to use test_i18ncmp from the day one, though.

Thanks.  Will queue.
Previous: Carlos Martín Nieto
Message 13 of 13 in “Improve branch UI for setting upstream information”
  1. 0/3 Improve branch UI for setting upstream informationCarlos Martín Nieto, Aug 20, 2012
  2. 1/3 branch: introduce --set-upstream-toCarlos Martín Nieto, Aug 20, 2012
  3. 2/3 branch: add --unset-upstream optionCarlos Martín Nieto, Aug 20, 2012
  4. Junio C HamanoAug 23, 2012
  5. Carlos Martín NietoAug 27, 2012
  6. Junio C HamanoAug 27, 2012
  7. Junio C HamanoAug 27, 2012
  8. Carlos Martín NietoAug 27, 2012
  9. 3/3 branch: suggest how to undo a --set-upstream when given one branchCarlos Martín Nieto, Aug 20, 2012
  10. Junio C HamanoAug 20, 2012
  11. Carlos Martín NietoAug 22, 2012
  12. 3/3 branch: deprecate --set-upstream and show help if we detect possible mistaken useCarlos Martín Nieto, Aug 23, 2012
  13. Junio C HamanoAug 23, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.