status: disable color for porcelain format

diff --git a/builtin-commit.c b/builtin-commit.c
index 8411236fda1f74a6b5aa861ce81775c49290e4d2..ded58984ac983fe09b817c2c2b0af386266f6fe3 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -382,7 +382,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
                wt_shortstatus_print(s, null_termination);
                break;
        case STATUS_FORMAT_PORCELAIN:
-               wt_shortstatus_print(s, null_termination);
+               wt_porcelain_print(s, null_termination);
                break;
        case STATUS_FORMAT_LONG:
                wt_status_print(s);
@@ -968,10 +968,14 @@ int cmd_status(int argc, const char **argv, const char *prefix)
        case STATUS_FORMAT_SHORT:
                if (s.relative_paths)
                        s.prefix = prefix;
+               if (s.use_color == -1)
+                       s.use_color = git_use_color_default;
+               if (diff_use_color_default == -1)
+                       diff_use_color_default = git_use_color_default;
                wt_shortstatus_print(&s, null_termination);
                break;
        case STATUS_FORMAT_PORCELAIN:
-               wt_shortstatus_print(&s, null_termination);
+               wt_porcelain_print(&s, null_termination);
                break;
        case STATUS_FORMAT_LONG:
                s.verbose = verbose;