From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Christian Couder <chriscool@tuxfamily•org>,
git@vger•kernel.org, Michael Haggerty <mhagger@alum•mit.edu>
Subject: Re: [PATCH v1 1/3] replace: add --graft option
Date: Fri, 23 May 2014 14:22:14 -0700 [thread overview]
Message-ID: <xmqqd2f4i41l.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140523202853.GH19088@sigill.intra.peff.net> (Jeff King's message of "Fri, 23 May 2014 16:28:53 -0400")
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.
Perhaps. That would filter out an empty line as well, which would
be good.
>> Perhaps a more future-proof way to write Christian's code may be:
>> ...
>> which may not be too bad.
>
> Sounds familiar:
>
> http://article.gmane.org/gmane.comp.version-control.git/249575
Yup, instead of having to memmove() repeatedly, copying into it
while skipping 'parent ' lines may be better.
next prev parent reply other threads:[~2014-05-23 21:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 21:33 [PATCH v1 0/3] Add --graft option to git replace Christian Couder
2014-05-22 21:33 ` [PATCH v1 1/3] replace: add --graft option Christian Couder
2014-05-23 19:27 ` Junio C Hamano
2014-05-23 19:51 ` Jeff King
2014-05-23 20:05 ` Junio C Hamano
2014-05-23 20:28 ` Jeff King
2014-05-23 21:22 ` Junio C Hamano [this message]
2014-05-23 22:59 ` Eric Sunshine
2014-06-01 16:06 ` Christian Couder
2014-05-22 21:33 ` [PATCH v1 2/3] replace: add test for --graft Christian Couder
2014-05-22 21:33 ` [PATCH v1 3/3] Documentation: replace: add --graft option Christian Couder
2014-05-23 17:06 ` Jakub Narębski
2014-05-23 18:26 ` Junio C Hamano
2014-05-23 16:59 ` [PATCH v1 0/3] Add --graft option to git replace Junio C Hamano
2014-05-27 19:05 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd2f4i41l.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox