Merge branch 'tr/grep-l-with-decoration' into maint

* tr/grep-l-with-decoration: grep: fix -l/-L interaction with decoration lines
2012-02-10 13:59:02 -08:00
parent 5febbda4e7 50dd0f2fd9
commit 184a7aa7bf
2 changed files with 25 additions and 2 deletions
--- a/builtin/grep.c
+++ b/builtin/grep.c
@ -1034,8 +1034,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)

 #ifndef NO_PTHREADS
 	if (use_threads) {
-		if (opt.pre_context || opt.post_context || opt.file_break ||
-		    opt.funcbody)
+		if (!(opt.name_only || opt.unmatch_name_only || opt.count)
+		    && (opt.pre_context || opt.post_context ||
+			opt.file_break || opt.funcbody))
 			skip_first_line = 1;
 		start_threads(&opt);
 	}