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

Re: [PATCH v1 1/3] replace: add --graft option

From
Eric Sunshine <sunshine@sunshineco.com>
Date
May 23, 2014, 22:59 UTC
Message-ID
<CAPig+cRG_LsV3q1qRP7C6LpFA7hcBCDmX8Xm=6AdxtRmY3oYWQ@mail.gmail.com>
In-Reply-To
<xmqqd2f4i41l.fsf@gitster.dls.corp.google.com>
On Fri, May 23, 2014 at 5:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 15 quoted lines
> Jeff King <peff@peff.net> writes:
>
>> On Fri, May 23, 2014 at 01:05:40PM -0700, Junio C Hamano wrote:
>>
>>> I just read read_graft_line(); it allows an empty line (both
>>> length-0 before the terminating LF or CRLF, and a line with
>>> isspace() only) and ignore them, so "grep '^[^#]'" is not
>>> sufficient.
>>
>> Thanks, I missed the space trimming. I think:
>>
>>   grep '^[^# \t]'
>>
>> would be enough, though I am not sure that "\t" is portable over a raw
>> tab.

'grep' does not recognize "\t" on BSD or derivatives, such as Mac OS X. (Nor does 'sed'.)

Previous: Junio C HamanoNext: Christian Couder
Message 8 of 15 in “Add --graft option to git replace”
  1. 0/3 Add --graft option to git replaceChristian Couder, May 22, 2014
  2. 1/3 replace: add --graft optionChristian Couder, May 22, 2014
  3. Junio C HamanoMay 23, 2014
  4. Jeff KingMay 23, 2014
  5. Junio C HamanoMay 23, 2014
  6. Jeff KingMay 23, 2014
  7. Junio C HamanoMay 23, 2014
  8. Eric SunshineMay 23, 2014
  9. Christian CouderJun 1, 2014
  10. 2/3 replace: add test for --graftChristian Couder, May 22, 2014
  11. 3/3 Documentation: replace: add --graft optionChristian Couder, May 22, 2014
  12. Jakub NarębskiMay 23, 2014
  13. Junio C HamanoMay 23, 2014
  14. Junio C HamanoMay 23, 2014
  15. Christian CouderMay 27, 2014

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.