grep: slight refactoring to the code that disables threading

vleschuk · gitster · commit 044b1f3cb4ff · 2015-12-15T10:49:57.000-08:00
When show-in-pager option is used, threading is unconditionally
disabled, but this happened much earlier than the code that
determines the use of threading based on the operand (i.e. we do not
thread search in the object database).  Consolidate the code to
disable threading to just one place.

Signed-off-by: Victor Leschuk &lt;vleschuk@accesssoftek.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/grep.c b/builtin/grep.c
@@ -801,7 +801,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		opt.output_priv = &path_list;
 		opt.output = append_path;
 		string_list_append(&path_list, show_in_pager);
-		use_threads = 0;
 	}
 
 	if (!opt.pattern_list)
@@ -832,7 +831,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	}
 
 #ifndef NO_PTHREADS
-	if (list.nr || cached)
+	if (list.nr || cached || show_in_pager)
 		use_threads = 0;
 #else
 	use_threads = 0;

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,6 @@ int cmd_grep(int argc, const char *argv, const char prefix)`
`801`	`801`	`opt.output_priv = &path_list;`
`802`	`802`	`opt.output = append_path;`
`803`	`803`	`string_list_append(&path_list, show_in_pager);`
`804`		`- use_threads = 0;`
`805`	`804`	`}`
`806`	`805`
`807`	`806`	`if (!opt.pattern_list)`
`@@ -832,7 +831,7 @@ int cmd_grep(int argc, const char *argv, const char prefix)`
`832`	`831`	`}`
`833`	`832`
`834`	`833`	`#ifndef NO_PTHREADS`
`835`		`- if (list.nr \|\| cached)`
	`834`	`+ if (list.nr \|\| cached \|\| show_in_pager)`
`836`	`835`	`use_threads = 0;`
`837`	`836`	`#else`
`838`	`837`	`use_threads = 0;`