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

Re: [PATCH] fixup! mergetool: add automerge configuration

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 9, 2021, 23:21 UTC
Message-ID
<xmqqzh1hd7ci.fsf@gitster.c.googlers.com>
In-Reply-To
<X/onP6vFAHH8SUBo@camp.crustytoothpaste.net>
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> Ah, yes, this is true.  The statement about "\r" is also true for Linux
> with POSIXLY_CORRECT, IIRC.

It's nice to have a way to reproduce without having a separate toolchain. Thanks for the suggestion.

Show 11 quoted lines
> Unfortunately, printf is not specified by POSIX to take hex escapes, so
> this, too is nonportable.  We are unfortunately allowed to use only
> octal escapes (yuck).  However, we can write this:
>
>   cr=$(printf '\r')
>
> or
>
>   cr=$(printf '\015')
>
> I think the former is clearer, since that's what we were writing before.

The latter however appears more portable at least to traditionalists ;-)

Previous: Junio C Hamano
Message 24 of 24 in “fixup! mergetool: add automerge configuration”
  1. fixup! mergetool: add automerge configurationDavid Aguilar, Jan 9, 2021
  2. brian m. carlsonJan 9, 2021
  3. fixup! mergetool: add automerge configurationDavid Aguilar, Jan 9, 2021
  4. Seth HouseJan 9, 2021
  5. Junio C HamanoJan 10, 2021
  6. Re* [PATCH v2] fixup! mergetool: add automerge configurationJunio C Hamano, Jan 10, 2021
  7. Seth HouseJan 10, 2021
  8. Junio C HamanoJan 10, 2021
  9. Seth HouseJan 16, 2021
  10. automerge implementation ideas for WindowsSeth House, Jan 20, 2021
  11. Junio C HamanoJan 21, 2021
  12. Seth HouseJan 22, 2021
  13. Junio C HamanoJan 22, 2021
  14. brian m. carlsonJan 22, 2021
  15. Johannes SchindelinJan 22, 2021
  16. brian m. carlsonJan 22, 2021
  17. Johannes SchindelinJan 26, 2021
  18. Seth HouseJan 26, 2021
  19. Junio C HamanoJan 26, 2021
  20. Seth HouseJan 27, 2021
  21. Junio C HamanoJan 29, 2021
  22. Junio C HamanoJan 9, 2021
  23. Junio C HamanoJan 10, 2021
  24. Junio C HamanoJan 9, 2021

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.