builtin-commit: do not color status output shown in the message template

Noticed by Ping Yin on the list.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-commit.c b/builtin-commit.c
index 5e2257c96101ff3d596aa898921ee96cb6d896cb..7616dd152fec439e7d8b8bdcb046b1837e2b68ee 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -159,7 +159,7 @@ static const char sign_off_header[] = "Signed-off-by: ";
 static int prepare_log_message(const char *index_file, const char *prefix)
 {
        struct stat statbuf;
 static int prepare_log_message(const char *index_file, const char *prefix)
 {
        struct stat statbuf;

-       int commitable;
+       int commitable, saved_color_setting;

        struct strbuf sb;
        char *buffer;
        FILE *fp;
        struct strbuf sb;
        char *buffer;
        FILE *fp;


@@ -243,7 +243,10 @@ static int prepare_log_message(const char *index_file, const char *prefix)
        if (only_include_assumed)
                fprintf(fp, "# %s\n", only_include_assumed);
 
        if (only_include_assumed)
                fprintf(fp, "# %s\n", only_include_assumed);
 

+       saved_color_setting = wt_status_use_color;
+       wt_status_use_color = 0;

        commitable = run_status(fp, index_file, prefix);
        commitable = run_status(fp, index_file, prefix);

+       wt_status_use_color = saved_color_setting;

 
        fclose(fp);
 
 
        fclose(fp);
 

diff --git a/wt-status.h b/wt-status.h
index f58ebcbb23f214c1fea8f4cb8e10c3491b8e0469..225fb4d53561f4f1d6ad43fd990dda1c6da956f0 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -27,6 +27,7 @@ struct wt_status {
 };
 
 int git_status_config(const char *var, const char *value);
 };
 
 int git_status_config(const char *var, const char *value);

+int wt_status_use_color;

 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);