From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: git@vger.kernel.org, johan@herland.net, tr@thomasrast.ch,
mhagger@alum.mit.edu, peff@peff.net, sunshine@sunshineco.com,
ramsay@ramsay1.demon.co.uk, jrnieder@gmail.com,
marcnarc@xiplink.com
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines
Date: Mon, 10 Nov 2014 11:58:49 -0800 [thread overview]
Message-ID: <xmqqy4ri969y.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20141110.200502.1295000903783079007.chriscool@tuxfamily.org> (Christian Couder's message of "Mon, 10 Nov 2014 20:05:02 +0100 (CET)")
Christian Couder <chriscool@tuxfamily.org> writes:
> From: Junio C Hamano <gitster@pobox.com>
> Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines
> Date: Mon, 10 Nov 2014 09:49:34 -0800
>
>> Christian Couder <chriscool@tuxfamily.org> writes:
>>
>>> Make sure we look for trailers before any conflict line
>>> by reusing the ignore_non_trailer() function.
>>>
>>> Helped-by: Junio C Hamano <gitster@pobox.com>
>>> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>>> ---
>>
>> It makes sense to unify the logic to decide where the trailer block
>> is, I would think. I however don't think I helped this change in
>> any way, not more than "maintained the codebase as a solid
>> foundation to build new features on", but at that point it would
>> apply to any other change and not worth mentioning ;-).
>
> Do you want me to resend the series with only the Helped-by removed?
Nah, I've already removed it. You have better things to spend your
time on ;-)
next prev parent reply other threads:[~2014-11-10 19:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-09 9:23 [PATCH v2 0/5] Small "git interpret-trailers" fixes Christian Couder
2014-11-09 9:23 ` [PATCH v2 1/5] trailer: ignore comment lines inside the trailers Christian Couder
2014-11-09 9:23 ` [PATCH v2 2/5] trailer: display a trailer without its trailing newline Christian Couder
2014-11-09 9:23 ` [PATCH v2 3/5] commit: make ignore_non_trailer() non static Christian Couder
2014-11-09 9:23 ` [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines Christian Couder
2014-11-10 17:49 ` Junio C Hamano
2014-11-10 19:05 ` Christian Couder
2014-11-10 19:58 ` Junio C Hamano [this message]
2014-11-09 9:23 ` [PATCH v2 5/5] trailer: add test with an old style conflict block 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=xmqqy4ri969y.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=jrnieder@gmail.com \
--cc=marcnarc@xiplink.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=ramsay@ramsay1.demon.co.uk \
--cc=sunshine@sunshineco.com \
--cc=tr@thomasrast.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.