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

[PATCH 0/2] @{u} updates

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 20, 2010, 09:38 UTC
Message-ID
<1263980322-4142-1-git-send-email-gitster@pobox.com>
In-Reply-To
<7vwrzmqypn.fsf@alter.siamese.dyndns.org>

Earlier I wondered if the approach Dscho's patch takes to teach the new @{upstream} syntax to substitute_branch_name() (hence dwim_ref()) without teaching it to interpret_branch_name() (hence strbuf_branchname()) was a bad idea. I thought about this a bit more; there are some downsides for not doing so.

The first patch adds a handful of tests that show why strbuf_branchname() callers may also want to learn about the new syntax. The second patch moves the logic to interpret_branch_name() to make them happier.

The name of the key function was changed from tracked_suffix() to upstream_mark(), not only because the syntax talks about @{upstream}, but because the parsing needs to recognize the @{u}/@{upstream} mark at the beginning of the given string (that is a suffix to some other string), and strip it (the earlier code wanted @{u} to be at the very end but the callers need to have it at the beginning).

Junio C Hamano (2):
  t1506: more test for @{upstream} syntax
  Teach @{upstream} syntax to strbuf_branchanme()
 sha1_name.c                   |  116 ++++++++++++++++++++++++++---------------
 t/t1506-rev-parse-upstream.sh |   41 ++++++++++++++
 2 files changed, 115 insertions(+), 42 deletions(-)
Previous: Junio C HamanoNext: Junio C Hamano
Message 13 of 30 in “default behaviour for `gitmerge` (no arguments)”
  1. Gareth AdamsJan 11, 2010
  2. Junio C HamanoJan 11, 2010
  3. Jeff KingJan 12, 2010
  4. Junio C HamanoJan 12, 2010
  5. Jeff KingJan 12, 2010
  6. Junio C HamanoJan 13, 2010
  7. Johannes SchindelinJan 13, 2010
  8. Junio C HamanoJan 13, 2010
  9. Johannes SchindelinJan 13, 2010
  10. Junio C HamanoJan 13, 2010
  11. Johannes SchindelinJan 13, 2010
  12. Junio C HamanoJan 13, 2010
  13. 0/2 @{u} updatesJunio C Hamano, Jan 20, 2010
  14. 1/2 t1506: more test for @{upstream} syntaxJunio C Hamano, Jan 20, 2010
  15. Jeff KingJan 26, 2010
  16. Junio C HamanoJan 26, 2010
  17. Jeff KingJan 27, 2010
  18. Junio C HamanoJan 27, 2010
  19. Jeff KingJan 28, 2010
  20. Junio C HamanoJan 26, 2010
  21. Jeff KingJan 27, 2010
  22. Junio C HamanoJan 27, 2010
  23. Jeff KingJan 28, 2010
  24. 1/3 test combinations of @{} syntaxJeff King, Jan 28, 2010
  25. 2/3 fix parsing of @{-1}@{u} combinationJeff King, Jan 28, 2010
  26. 3/3 reject @{-1} not at beginning of object nameJeff King, Jan 28, 2010
  27. Junio C HamanoJan 28, 2010
  28. Jeff KingJan 29, 2010
  29. 2/2 Teach @{upstream} syntax to strbuf_branchanme()Junio C Hamano, Jan 20, 2010
  30. Johannes SchindelinJan 20, 2010

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.