grep: slight refactoring to the code that disables threading

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 <vleschuk@accesssoftek.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/grep.c b/builtin/grep.c
index 734d6ceaaeedb5c4b26396b3b435de20824fa5b0..a892967467ff988d1a858634ea64d7ed104b96d3 100644 (file)
--- 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;