From: Clemens Buchacher <drizzd@aon.at>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>, "SZEDER Gábor" <szeder@ira.uka.de>,
git@vger.kernel.org
Subject: [PATCH] grep: fix exit status if external_grep() returns error
Date: Mon, 7 Sep 2009 10:48:01 +0200 [thread overview]
Message-ID: <20090907084801.GB10797@localhost> (raw)
In-Reply-To: <7v3a6zu1dk.fsf@alter.siamese.dyndns.org>
On Sun, Sep 06, 2009 at 03:58:15PM -0700, Junio C Hamano wrote:
> Your patch is queued in 'pu', but it seems to break the exit status in a
> strange way with my limited test.
[...]
> The command should not give different exit status depending on the
> destination of standard output stream.
I could also reproduce this in master using
:~/git/t$ git grep --no-color not-going-to-match .; echo $?
The problem is a small bug in grep_cache(), which is triggered here because
external_grep() cannot deal with relative paths (not sure why that's the
case though). Fix below.
Clemens
--o<--
If external_grep() is called and returns an error, grep_cache() mistakenly
reported a hit, even if there were none. The bug can be triggered by
calling "git grep --no-color" from a subdirectory.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
builtin-grep.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-grep.c b/builtin-grep.c
index ad0e0a5..b577738 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -500,9 +500,9 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached,
* be a lot more optimized
*/
if (!cached && external_grep_allowed) {
- hit = external_grep(opt, paths, cached);
- if (hit >= 0)
- return hit;
+ int ret = external_grep(opt, paths, cached);
+ if (ret >= 0)
+ return ret;
}
#endif
--
1.6.4.2.266.gbaa17
next prev parent reply other threads:[~2009-09-07 8:48 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-02 8:03 [BUG] 'add -u' doesn't work from untracked subdir SZEDER Gábor
2009-09-02 8:19 ` Jeff King
2009-09-04 7:02 ` Clemens Buchacher
2009-09-05 6:18 ` Jeff King
2009-09-05 7:02 ` Junio C Hamano
2009-09-05 7:20 ` Jeff King
2009-09-05 7:58 ` Junio C Hamano
2009-09-05 8:02 ` Jeff King
2009-09-05 8:23 ` Junio C Hamano
2009-09-06 18:28 ` Clemens Buchacher
2009-09-09 23:46 ` Nanako Shiraishi
2009-09-10 19:53 ` Junio C Hamano
2009-09-10 20:32 ` Clemens Buchacher
2009-09-05 12:31 ` [PATCH 1/2] grep: accept relative paths outside current working directory Clemens Buchacher
2009-09-05 12:33 ` [PATCH 2/2] add 'scope' config option Clemens Buchacher
2009-09-05 13:10 ` [PATCH 2/2 v2] " Clemens Buchacher
2009-09-06 22:58 ` [PATCH 1/2] grep: accept relative paths outside current working directory Junio C Hamano
2009-09-07 8:48 ` Clemens Buchacher [this message]
2009-09-07 18:13 ` [PATCH] grep: fix exit status if external_grep() returns error Junio C Hamano
2009-09-05 8:19 ` [BUG] 'add -u' doesn't work from untracked subdir Jeff King
2009-09-05 7:25 ` Junio C Hamano
2009-09-05 8:46 ` Clemens Buchacher
2009-09-05 17:28 ` Junio C Hamano
2009-09-05 17:58 ` Jakub Narebski
2009-09-05 18:45 ` Clemens Buchacher
2009-09-05 21:46 ` 'add -u' without path is relative to cwd Junio C Hamano
2009-09-06 12:32 ` [BUG] 'add -u' doesn't work from untracked subdir Matthieu Moy
2009-09-06 18:16 ` Clemens Buchacher
2009-09-07 6:23 ` Matthieu Moy
2009-09-07 7:33 ` SZEDER Gábor
2009-09-07 8:06 ` Matthieu Moy
2009-09-07 0:07 ` Nanako Shiraishi
2009-09-07 5:07 ` Junio C Hamano
2009-09-07 7:50 ` Clemens Buchacher
2009-09-04 8:32 ` SZEDER Gábor
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=20090907084801.GB10797@localhost \
--to=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=szeder@ira.uka.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).