From: Stefano Lattarini <stefano.lattarini@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@student.ethz.ch>,
git@vger.kernel.org
Subject: Re: [PATCH v3 1/3] Demonstrate a bug in --word-diff where diff.*.wordregex is "sticky"
Date: Wed, 14 Mar 2012 22:03:04 +0100 [thread overview]
Message-ID: <4F610788.3090604@gmail.com> (raw)
In-Reply-To: <4F60F67D.9050003@kdbg.org>
On 03/14/2012 08:50 PM, Johannes Sixt wrote:
> The test case applies a custom wordRegex to one file in a diff, and expects
> that the default word splitting applies to the second file in the diff.
> But the custom wordRegex is also incorrectly used for the second file.
>
> Helped-by: Thomas Rast <trast@student.ethz.ch>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> Changes in this round, where I do not resend 2/3 and 3/3:
>
> - Use test_unconfig.
> - Use compare_diff_patch to check the result.
> - Fix a broken && chain at the end of the last test.
> - Name the files a.tex and z.tex as per your suggestion.
>
But Junio suggested using 'z.txt' (not 'z.tex'); quoting his last message:
The use of files "a" and "z" as an example of pair of a tex and non tex
input makes the test look overly artificial (why not a.tex vs z.txt or
something?), but other than that, looks cleanly done.
Regards,
Stefano
next prev parent reply other threads:[~2012-03-14 21:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-14 18:24 [PATCH v2 1/3] Demonstrate a bug in --word-diff where diff.*.wordregex is "sticky" Thomas Rast
2012-03-14 18:24 ` [PATCH 2/3] diff: refactor the word-diff setup from builtin_diff_cmd Thomas Rast
2012-03-14 19:26 ` Junio C Hamano
2012-03-14 18:24 ` [PATCH 3/3] diff: tweak a _copy_ of diff_options with word-diff Thomas Rast
2012-03-14 19:38 ` Junio C Hamano
2012-03-14 19:24 ` [PATCH v2 1/3] Demonstrate a bug in --word-diff where diff.*.wordregex is "sticky" Junio C Hamano
2012-03-14 19:50 ` [PATCH v3 " Johannes Sixt
2012-03-14 21:03 ` Stefano Lattarini [this message]
2012-03-14 21:38 ` Junio C Hamano
2012-03-14 21:53 ` 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=4F610788.3090604@gmail.com \
--to=stefano.lattarini@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=trast@student.ethz.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).