From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/2] diffcore-pickaxe: terminate grepping as soon as it hits
Date: Mon, 15 Aug 2011 09:41:23 +0700 [thread overview]
Message-ID: <1313376083-24713-2-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1313376083-24713-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
diffcore-pickaxe.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 12811b9..e028dd5 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -21,11 +21,7 @@ static int diffgrep_consume(void *priv, char *line, unsigned long len)
if (line[0] != '+' && line[0] != '-')
return 0;
if (data->hit)
- /*
- * NEEDSWORK: we should have a way to terminate the
- * caller early.
- */
- return 0;
+ return -1;
/* Yuck -- line ought to be "const char *"! */
hold = line[len];
line[len] = '\0';
--
1.7.4.74.g639db
next prev parent reply other threads:[~2011-08-15 2:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-15 2:41 [PATCH 1/2] xdiff-interface: allow consume function to quit early by returning non-zero Nguyễn Thái Ngọc Duy
2011-08-15 2:41 ` Nguyễn Thái Ngọc Duy [this message]
2011-08-17 2:44 ` [PATCH 2/2] diffcore-pickaxe: terminate grepping as soon as it hits Nguyen Thai Ngoc Duy
2011-08-15 19:41 ` [PATCH 1/2] xdiff-interface: allow consume function to quit early by returning non-zero Junio C Hamano
2011-08-17 2:26 ` Nguyen Thai Ngoc Duy
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=1313376083-24713-2-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).