status: disable color for porcelain format

The porcelain format is identical to the shortstatus format,
except that it should not respect any user configuration,
including color.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-commit.c b/builtin-commit.c
index 07cc76c04a4b7040a4fc9fe94744f13a1848c5ff..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);
                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);
                break;
        case STATUS_FORMAT_LONG:
                wt_status_print(s);


@@ -975,7 +975,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
                wt_shortstatus_print(&s, null_termination);
                break;
        case STATUS_FORMAT_PORCELAIN:
                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;
                break;
        case STATUS_FORMAT_LONG:
                s.verbose = verbose;

diff --git a/wt-status.c b/wt-status.c
index 696c6b0bf1eac0282fbd6e140f5ddda66d7f5a93..756defea1a4d5ee38700608cf4ed231c27f9a294 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -688,3 +688,9 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination)
                wt_shortstatus_untracked(null_termination, it, s);
        }
 }
                wt_shortstatus_untracked(null_termination, it, s);
        }
 }

+
+void wt_porcelain_print(struct wt_status *s, int null_termination)
+{
+       s->use_color = 0;
+       wt_shortstatus_print(s, null_termination);
+}

diff --git a/wt-status.h b/wt-status.h
index 39c9aef7a53bb7063c7c344f18426a9794e46cdc..a4bddcf8db5840de33c10be80864084fc596ea24 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -57,5 +57,6 @@ void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
 
 void wt_shortstatus_print(struct wt_status *s, int null_termination);
 void wt_status_collect(struct wt_status *s);
 
 void wt_shortstatus_print(struct wt_status *s, int null_termination);

+void wt_porcelain_print(struct wt_status *s, int null_termination);

 
 #endif /* STATUS_H */
 
 #endif /* STATUS_H */