From: Johannes Sixt <j.sixt@viscovery.net>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes
Date: Wed, 10 Oct 2012 16:21:43 +0200 [thread overview]
Message-ID: <50758477.3030304@viscovery.net> (raw)
In-Reply-To: <1349877544-17648-3-git-send-email-pclouds@gmail.com>
Am 10/10/2012 15:59, schrieb Nguyễn Thái Ngọc Duy:
> This patch passes real paths down to grep_source_load_driver(). Except
> grepping a blob, all other cases should have right paths down to
... grepping a blob or tree object...
> grep_source_load_driver(). In other words, .gitattributes are still
> respected.
...
> +test_expect_success 'grep --cached respects binary diff attribute (2)' '
> + git add .gitattributes &&
> + rm .gitattributes &&
> + git grep --cached text t >actual &&
> + test_cmp expect actual &&
> + git checkout .gitattributes &&
> + git rm --cached .gitattributes
> +'
This should perhaps be test_when_finished "git rm --cached .gitattributes".
> +
> +test_expect_success 'grep tree respects binary diff attribute' '
I was confused by the word "tree" here. Isn't "pathspec" more correct?
> + git commit -m new &&
> + echo "Binary file HEAD:t matches" >expect &&
> + git grep text HEAD -- t >actual &&
> + test_cmp expect actual &&
> + git reset HEAD^
> +'
And in yet another test, should
git grep text HEAD:t
/not/ respect the binary attribute?
At any rate, I don't observe the warnings anymore with this series.
Thanks,
-- Hannes
next prev parent reply other threads:[~2012-10-10 14:22 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 9:03 'git grep needle rev' attempts to access 'rev:.../.gitattributes' in the worktree Johannes Sixt
2012-10-09 9:38 ` Nguyen Thai Ngoc Duy
2012-10-09 12:01 ` Nguyen Thai Ngoc Duy
2012-10-09 12:41 ` Jeff King
2012-10-09 18:59 ` Junio C Hamano
2012-10-10 5:17 ` Nguyen Thai Ngoc Duy
2012-10-10 5:33 ` Junio C Hamano
2012-10-10 5:45 ` Nguyen Thai Ngoc Duy
2012-10-10 11:34 ` Nguyễn Thái Ngọc Duy
2012-10-10 11:34 ` [PATCH 1/3] quote: let caller reset buffer for quote_path_relative() Nguyễn Thái Ngọc Duy
2012-10-10 21:13 ` Junio C Hamano
2012-10-11 13:04 ` Nguyen Thai Ngoc Duy
2012-10-11 16:42 ` Junio C Hamano
2012-10-10 11:34 ` [PATCH 2/3] grep: pass true path name to grep machinery Nguyễn Thái Ngọc Duy
2012-10-10 11:34 ` [PATCH 3/3] grep: stop looking at random places for .gitattributes Nguyễn Thái Ngọc Duy
2012-10-10 11:51 ` Johannes Sixt
2012-10-10 12:03 ` Nguyen Thai Ngoc Duy
2012-10-10 12:12 ` Johannes Sixt
2012-10-10 12:32 ` Nguyen Thai Ngoc Duy
2012-10-10 12:43 ` Johannes Sixt
2012-10-10 12:51 ` Nguyen Thai Ngoc Duy
2012-10-10 19:44 ` Junio C Hamano
2012-10-11 5:55 ` Johannes Sixt
2012-10-11 7:04 ` Michael Haggerty
2012-10-11 8:17 ` Nguyen Thai Ngoc Duy
2012-10-10 13:59 ` [PATCH v2 0/2] Re: 'git grep needle rev' attempts to access 'rev:.../.gitattributes' in the worktree Nguyễn Thái Ngọc Duy
2012-10-10 13:59 ` [PATCH v2 1/2] quote: let caller reset buffer for quote_path_relative() Nguyễn Thái Ngọc Duy
2012-10-10 13:59 ` [PATCH v2 2/2] grep: stop looking at random places for .gitattributes Nguyễn Thái Ngọc Duy
2012-10-10 14:21 ` Johannes Sixt [this message]
2012-10-10 19:56 ` Junio C Hamano
2012-10-11 5:45 ` Johannes Sixt
2012-10-11 15:51 ` Junio C Hamano
2012-10-12 7:33 ` Johannes Sixt
2012-10-14 4:29 ` Junio C Hamano
2012-10-15 6:02 ` Johannes Sixt
2012-10-15 16:54 ` Junio C Hamano
2012-10-16 6:39 ` Johannes Sixt
2012-10-17 7:05 ` Johannes Sixt
2012-10-17 7:33 ` Junio C Hamano
2012-10-11 1:49 ` Nguyen Thai Ngoc Duy
2012-10-11 3:15 ` Junio C Hamano
2012-10-12 10:49 ` [PATCH v3] " Nguyễn Thái Ngọc Duy
2012-10-12 16:47 ` Junio C Hamano
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=50758477.3030304@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).