threads / patch / 29432

v2Fix the result of "git grep [-l|-L] -C <num>"

Subject: [PATCH v2] Fix the result of "git grep [-l|-L] -C <num>"

## tl;dr

One message between Jan 23, 2012 and Jan 23, 2012. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Albert Yale· Jan 23, 2012, 17:06 UTC · lore

When combining "git grep [-l|-L]" with "-C <num>", the first result is omitted.

Reviewed-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Albert Yale <surfingalbert@gmail.com>
---
 builtin/grep.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Show changes to builtin/grep.c +4 −1
diff --git a/builtin/grep.c b/builtin/grep.c
index 9ce064a..beebe20 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1036,7 +1036,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	if (use_threads) {
 		if (opt.pre_context || opt.post_context || opt.file_break ||
 		    opt.funcbody)
-			skip_first_line = 1;
+		{
+			if( ! ( opt.name_only || opt.unmatch_name_only ) )
+				skip_first_line = 1;
+		}
 		start_threads(&opt);
 	}
 #endif
-- 
1.7.8.3

← back to recent threads