From: Junio C Hamano <gitster@pobox•com>
To: Max Kirillov <max@max630•net>
Cc: Jeff King <peff@peff•net>, git@vger•kernel.org
Subject: Re: [PATCH v2 4/4] t4059: rewrite to be adaptive to hunk filtering
Date: Sat, 11 Apr 2015 22:48:22 -0700 [thread overview]
Message-ID: <xmqq61916gnt.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1428076716-4449-5-git-send-email-max@max630.net> (Max Kirillov's message of "Fri, 3 Apr 2015 18:58:36 +0300")
Max Kirillov <max@max630•net> writes:
> Looks like there is no exact specification what `diff -c` and
> `diff --cc` should output. Considering this it is not reasonable to
> hardcode any specific output in test.
OK.
> Rather, it should verify that file
> selection behaves the same as hunk selection.
Hrm, really? "git diff --raw" and "git diff -p -w" on two trees
would not show identical set of paths, when the blob object are
different byte-wise but are equivalent at the content level per
given definition of equivalence (e.g. "-w"). Given that --cc is
to look at the differences at hunk/content level to combine and omit
uninteresting ones from the output, relative to -c output, I would
imagine that the file selection and the hunk selection are expected
to behave differently.
So, having said that I am a bit skeptical about the description of
the goals, there are a few nits on the implementation, too.
> +# the difference in short file must be returned if and only if it is shown in long file
> +for fn in win1 win2 merge delete base only1 only2 only1discard only2discard; do
> + if git diff --cc merge branch1 branch2 mergebase -- long/$fn | grep -q '^[ +-]\{3\}2\(change[12]|merge\)\?$'
> + then
Just like the earlier parts of this patch, write a newline when you
do not have to write a semicolon, and split lines after pipe when
your pipeline gets long, i.e.
for fn in win2 win2 ...
do
if git diff --cc ... |
grep 'pattern'
then
Do I smell some GNUism in your "grep" patterns?
You have
'^[ +-]\{3\}2\(change[12]|merge\)\?$'
but matching zero-or-one repetition with ? is not in BRE, and \? to
use it in BRE is a GNU extension.
Also in BRE , '|' is not an alternation (and making it into such
with '\|' in BRE is a GNU extension IIRC.
Worse, you are not using backslash here to invoke GNU extension, so
I suspect the grep invocations in the patch may not be working as
you expect.
Doubly worse, what is shown by "diff -c" for line 2 seems to be
three [- +] columns, followed by one of
2
2change1
2change2
2merged
followed by the end of line, so your "|merge" part may never match.
We encourage people to avoid \{m,n\}, because, it is not supported
by some implementations even though it is specified in POSIX for
BRE.
Perhaps spelling out what you are expecting a bit more explicitly,
e.g.
grep -e "^[-+ ][-+ ][-+ ]2$" \
-e "^[-+ ][-+ ][-+ ]2change[12]$" \
-e "^[-+ ][-+ ][-+ ]2merged$"
might be a reasonable way to write this in a more portable and
readable way. And turn that into a helper shell function to make it
more readable and maintainable for a bonus point.
Thanks.
next prev parent reply other threads:[~2015-04-12 5:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 20:34 [PATCH 0/4] diff --cc: relax path filtering Max Kirillov
2015-04-02 20:34 ` [PATCH 1/4] Add test for showing discarded changes with diff --cc Max Kirillov
2015-04-02 20:55 ` Junio C Hamano
2015-04-03 16:03 ` Max Kirillov
2015-04-02 20:34 ` [PATCH 2/4] combine-diff.c: refactor: extract insert_path() Max Kirillov
2015-04-02 20:34 ` [PATCH 3/4] diff --cc: relax too strict paths picking Max Kirillov
2015-04-02 20:59 ` Junio C Hamano
2015-04-02 20:34 ` [PATCH 4/4] t4059: rewrite to be adaptive to hunk filtering Max Kirillov
2015-04-02 21:13 ` [PATCH 0/4] diff --cc: relax path filtering Jeff King
2015-04-03 16:29 ` Max Kirillov
2015-04-03 15:58 ` [PATCH v2 " Max Kirillov
2015-04-03 15:58 ` [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents Max Kirillov
2015-04-11 20:04 ` Junio C Hamano
2015-04-11 21:07 ` Junio C Hamano
2015-04-11 21:20 ` Junio C Hamano
2015-04-12 5:43 ` Max Kirillov
2015-04-12 5:51 ` Junio C Hamano
2015-04-14 4:22 ` Max Kirillov
2015-04-14 4:09 ` [PATCH/RFC] combine-diff.c: make intersect_paths() behave like hunk filtering Max Kirillov
2015-04-03 15:58 ` [PATCH v2 2/4] combine-diff.c: refactor: extract insert_path() Max Kirillov
2015-04-11 20:14 ` Junio C Hamano
2015-04-03 15:58 ` [PATCH v2 3/4] diff --cc: relax too strict paths picking Max Kirillov
2015-04-03 15:58 ` [PATCH v2 4/4] t4059: rewrite to be adaptive to hunk filtering Max Kirillov
2015-04-12 5:48 ` Junio C Hamano [this message]
2015-04-14 4:18 ` Max Kirillov
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=xmqq61916gnt.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=max@max630$(echo .)net \
--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