t7508: use test_terminal for color output

diff --git a/builtin/grep.c b/builtin/grep.c
index fa351c49f4fd74b3cde1703ef98dba5f0c2c4e8f..a7157f56327c0a9b2d4cccbdb2ee47666902392d 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -284,7 +284,7 @@ static int wait_all(void)
 static int grep_cmd_config(const char *var, const char *value, void *cb)
 {
        int st = grep_config(var, value, cb);
-       if (git_color_default_config(var, value, cb) < 0)
+       if (git_default_config(var, value, cb) < 0)
                st = -1;
 
        if (!strcmp(var, "grep.threads")) {
@@ -543,7 +543,7 @@ static void compile_submodule_options(const struct grep_opt *opt,
         * submodule process has its own thread pool.
         */
        argv_array_pushf(&submodule_options, "--threads=%d",
-                        (num_threads + 1) / 2);
+                        DIV_ROUND_UP(num_threads, 2));
 
        /* Add Pathspecs */
        argv_array_push(&submodule_options, "--");