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

Re: default behaviour for `gitmerge` (no arguments)

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 13, 2010, 23:13 UTC
Message-ID
<7vska9k393.fsf@alter.siamese.dyndns.org>
In-Reply-To
<alpine.DEB.1.00.1001132348570.4985@pacific.mpi-cbg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 21 quoted lines
>> What I was asking was:
>> 
>> 	*PROVIDED* *IF* you wanted to keep the same semantics between
>>          them, then you would have patched i-b-n, but you didn't.  Was there
>>          a reason callers of s-b-n should know about @{u} but callers of i-b-n
>> 	shouldn't?
>> 
>> Expected answer was either:
>> 
>> 	(a) Codepath X that uses i-b-n shouldn't interpret @{upstream} as
>>             a symbolic name given by the user, but it should treat it as a
>>             mere SHA-1 expression instead for *this and that* reason.
>>             Otherwise we will see *this* breakage when the user does
>>             *that*.  That is why i-b-n doesn't know about the new syntax;
>>             or
>> 
>> 	(b) It was a thinko; all codepaths that use i-b-n should know the
>>             new syntax as they _are_ interested in learning the symbolic
>>             name when the user gives @{upstream}.
>
> And I gave answer (c): I do not remember.

That's fine. As long as we know it is (c) (your earlier response sounded as if you were saying (b)), we know that there might be issues we need to find and carefully look at before using this topic.

Previous: Johannes SchindelinNext: Junio C Hamano
Message 12 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.