From: Johannes Sixt <j6t@kdbg•org>
To: Jeff King <peff@peff•net>
Cc: Thomas Rast <trast@student•ethz.ch>,
Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org
Subject: Re: [PATCH] userdiff: allow * between cpp funcname words
Date: Tue, 06 Dec 2011 21:52:22 +0100 [thread overview]
Message-ID: <4EDE8086.9080303@kdbg.org> (raw)
In-Reply-To: <20111206201944.GB27930@sigill.intra.peff.net>
Am 06.12.2011 21:19, schrieb Jeff King:
> On Tue, Dec 06, 2011 at 09:17:56PM +0100, Thomas Rast wrote:
>
>>> Looks reasonable to me. You can see the difference, for instance, with:
>>>
>>> git show -U1 3c73a1d
>>>
>>> (The -U1 is because of the annoying "we will start looking for the
>>> header at the top of context, not the top of changes" behavior I
>>> mentioned last week).
>>
>> Actually (sadly) I'll have to revise it. It doesn't match much of C++
>> either, and I haven't yet come up with a reasonable regex that
>> matches, say,
>>
>> foo::Bar<int>::t& Baz::operator<<(
>>
>> which I would call ludicrous, but it's valid C++.
>
> Ick, yeah. Maybe it is worth doing the "*" thing for now, and then
> worrying about advanced C++ stuff on top as another patch. AFAICT, your
> original patch is a strict improvement.
Excuse me, where's the problem? The above example shows this
@@ -105,8 +105,8 @@ char *url_decode(const char *url)
struct strbuf out = STRBUF_INIT;
- const char *slash = strchr(url, '/');
+ const char *colon = strchr(url, ':');
...
with current 4cb5d10b. This looks quite correct, no?
-- Hannes
next prev parent reply other threads:[~2011-12-06 20:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 16:35 [PATCH] userdiff: allow * between cpp funcname words Thomas Rast
2011-12-06 19:02 ` Jeff King
2011-12-06 20:17 ` Thomas Rast
2011-12-06 20:19 ` Jeff King
2011-12-06 20:52 ` Johannes Sixt [this message]
2011-12-06 21:07 ` René Scharfe
2011-12-06 21:15 ` Junio C Hamano
2011-12-07 8:04 ` Thomas Rast
2011-12-07 21:13 ` Johannes Sixt
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=4EDE8086.9080303@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=trast@student$(echo .)ethz.ch \
/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