From: Lance Ward <ljward10@xxxxxxxxx>
Many users like to pipe colored results of git status to other commands
such as more or less, but by default colors are lost when piping without
changing the user's git configuration. Many other commands such as diff,
show, log and grep have a --color option to easily override this behavior.
This allows the status command to have a similar --color option providing
a simpler mechanism for temporarily forcing piped colored output.
Signed-off-by: Lance Ward <ljward10@xxxxxxxxx>
---
status: learn --color for piping colored output
Many users like to pipe colored results of git status to other commands
such as more or less, but by default colors are lost when piping without
changing the user's git configuration. Many other commands such as diff,
show, log and grep have a --color option to easily override this
behavior. This allows the status command to have a similar --color
option providing a simpler mechanism for temporarily forcing piped
colored output.
Signed-off-by: Lance Ward ljward10@xxxxxxxxx
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-854%2Fljward10%2Flw-add-status-color-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-854/ljward10/lw-add-status-color-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/854
builtin/commit.c | 7 ++++
diff.c | 5 +++
diff.h | 1 +
t/t7527-status-color-pipe.sh | 69 ++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 100755 t/t7527-status-color-pipe.sh
diff --git a/builtin/commit.c b/builtin/commit.c
index 739110c5a7f..1579f7cc9ed 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1355,6 +1355,7 @@ static int git_status_config(const char *k, const char *v, void *cb)
int cmd_status(int argc, const char **argv, const char *prefix)
{
static int no_renames = -1;
+ static int use_color = GIT_COLOR_AUTO;
static const char *rename_score_arg = (const char *)-1;
static struct wt_status s;
unsigned int progress_flag = 0;
@@ -1378,6 +1379,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
STATUS_FORMAT_LONG),
OPT_BOOL('z', "null", &s.null_termination,
N_("terminate entries with NUL")),
+ OPT__COLOR(&use_color, N_("use colored output")),
{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg,
N_("mode"),
N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
@@ -1410,6 +1412,11 @@ int cmd_status(int argc, const char **argv, const char *prefix)
handle_untracked_files_arg(&s);
handle_ignored_arg(&s);
+ if (use_color != GIT_COLOR_AUTO) {
+ s.use_color=use_color;
+ set_diff_color(use_color);
+ }
+
if (s.show_ignored_mode == SHOW_MATCHING_IGNORED &&
s.show_untracked_files == SHOW_NO_UNTRACKED_FILES)
die(_("Unsupported combination of ignored and untracked-files arguments"));
diff --git a/diff.c b/diff.c
index 69e3bc00ed8..fe7ffce6803 100644
--- a/diff.c
+++ b/diff.c
@@ -261,6 +261,11 @@ void init_diff_ui_defaults(void)
diff_detect_rename_default = DIFF_DETECT_RENAME;
}
+void set_diff_color(int use_color)
+{
+ diff_use_color_default = use_color;
+}
+
int git_diff_heuristic_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "diff.indentheuristic"))
diff --git a/diff.h b/diff.h
index 2ff2b1c7f2c..10196d9b040 100644
--- a/diff.h
+++ b/diff.h
@@ -501,6 +501,7 @@ int parse_long_opt(const char *opt, const char **argv,
int git_diff_basic_config(const char *var, const char *value, void *cb);
int git_diff_heuristic_config(const char *var, const char *value, void *cb);
void init_diff_ui_defaults(void);
+void set_diff_color(int use_color);
int git_diff_ui_config(const char *var, const char *value, void *cb);
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
#define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts)
diff --git a/t/t7527-status-color-pipe.sh b/t/t7527-status-color-pipe.sh
new file mode 100755
index 00000000000..ee4ab2ea821
--- /dev/null
+++ b/t/t7527-status-color-pipe.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='git status color option'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ echo 1 >original &&
+ git add .
+'
+
+# Normal git status does not pipe colors
+test_expect_success 'git status' '
+ git status >out &&
+ test_i18ngrep "original$" out
+'
+
+# Test new color option with never (expect same as above)
+test_expect_success 'git status --color=never' '
+ git status --color=never >out &&
+ test_i18ngrep "original$" out
+'
+
+# Test new color (default is always)
+test_expect_success 'git status --color' '
+ git status --color |
+ test_decode_color >out &&
+ test_i18ngrep "original<RESET>$" out
+'
+
+# Test new color option with always
+test_expect_success 'git status --color=always' '
+ git status --color=always |
+ test_decode_color >out &&
+ test_i18ngrep "original<RESET>$" out
+'
+
+# Test verbose (default)
+test_expect_success 'git status -v' '
+ git status -v |
+ test_decode_color >out &&
+ test_i18ngrep "+1" out
+'
+
+# Test verbose --color=never
+test_expect_success 'git status -v --color=never' '
+ git status -v --color=never |
+ test_decode_color >out &&
+ test_i18ngrep "+1" out
+'
+
+# Test verbose --color (default always)
+test_expect_success 'git status -v --color' '
+ git status -v --color |
+ test_decode_color >out &&
+ test_i18ngrep "<CYAN>@@ -0,0 +1 @@<RESET>" out &&
+ test_i18ngrep "<GREEN>+<RESET><GREEN>1<RESET>" out
+'
+
+test_done
+# Test verbose --color=always
+test_expect_success 'git status -v --color=always' '
+ git status -v --color=always |
+ test_decode_color >out &&
+ test_i18ngrep "<CYAN>@@ -0,0 +1 @@<RESET>" out &&
+ test_i18ngrep "GREEN>+<RESET><GREEN>1<RESET>" out
+'
+
+test_done
base-commit: e6362826a0409539642a5738db61827e5978e2e4
--
gitgitgadget
