From: Junio C Hamano <gitster@pobox.com>
To: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH v1 2/2] log -S: Add test which searches in binary files
Date: Thu, 22 Nov 2018 10:34:03 +0900 [thread overview]
Message-ID: <xmqqzhu1520k.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <84cbbfbd213b358d1e2d7cce8b4685b09efac3de.1542833244.git.thomas.braun@virtuell-zuhause.de> (Thomas Braun's message of "Wed, 21 Nov 2018 21:52:28 +0100")
Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:
> The -S <regex> option of log looks for differences that changes the
> number of occurrences of the specified string (i.e. addition/deletion)
> in a file.
s/-S <regex>/-S<block of text>/ and
s/the specified string/the specified block of text/ would make it
more in line with how Documentation/gitdiffcore.txt explains it.
The original discussion from early 2017 also explains with a pointer
why the primary mode of -S is not <regex> but is <block of text>.
> diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
> index 42cc8afd8b..d430f6f2f9 100755
> --- a/t/t4209-log-pickaxe.sh
> +++ b/t/t4209-log-pickaxe.sh
> @@ -128,4 +128,15 @@ test_expect_success 'log -G looks into binary files with textconv filter' '
> test_cmp actual expected
> '
>
> +test_expect_success 'log -S looks into binary files' '
> + rm -rf .git &&
> + git init &&
Same comment as the one for 1/2 applies here.
> + printf "a\0b" >data.bin &&
> + git add data.bin &&
> + git commit -m "message" &&
> + git log -S a >actual &&
> + git log >expected &&
> + test_cmp actual expected
> +'
> +
> test_done
Other than these, I think both patches look sensible. Thanks for
resurrecting the old topic and reigniting it.
next prev parent reply other threads:[~2018-11-22 1:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 20:52 [PATCH 0/2] Teach log -G to ignore binary files Thomas Braun
2018-11-21 20:52 ` [PATCH v1 1/2] log -G: Ignore " Thomas Braun
2018-11-21 20:52 ` [PATCH v1 2/2] log -S: Add test which searches in " Thomas Braun
2018-11-21 21:00 ` [PATCH 0/2] Teach log -G to ignore " Thomas Braun
2018-11-28 11:32 ` [PATCH v2] log -G: Ignore " Thomas Braun
2018-11-28 12:54 ` Ævar Arnfjörð Bjarmason
2018-12-14 18:44 ` Thomas Braun
2018-11-29 7:10 ` Junio C Hamano
2018-11-29 7:22 ` Junio C Hamano
2018-12-14 18:45 ` Thomas Braun
2018-12-14 18:45 ` Thomas Braun
2018-12-14 18:49 ` [PATCH v3] log -G: ignore " Thomas Braun
2018-12-26 23:24 ` Junio C Hamano
2018-11-22 1:34 ` Junio C Hamano [this message]
2018-11-28 11:31 ` [PATCH v1 2/2] log -S: Add test which searches in " Thomas Braun
2018-11-22 9:14 ` Ævar Arnfjörð Bjarmason
2018-11-24 2:27 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 1:29 ` [PATCH v1 1/2] log -G: Ignore " Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 10:16 ` Ævar Arnfjörð Bjarmason
2018-11-22 16:27 ` Jeff King
2018-11-28 11:31 ` Thomas Braun
2018-11-28 11:31 ` Thomas Braun
2018-11-22 16:20 ` Jeff King
2018-11-24 2:32 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-26 20:19 ` Stefan Beller
2018-11-27 0:51 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzhu1520k.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=thomas.braun@virtuell-zuhause.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).