[PATCH] When nothing to git-commit, honor the git-status color setting.
From: Brian Hetro <hidden>
Date: 2016-06-15 22:43:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
Instead of disabling color all of the time during a git-commit, allow the user's config preference in the situation where there is nothing to commit. In this situation, the status is printed to the terminal and not sent to COMMIT_EDITMSG, so honoring the status color setting is expected. Signed-off-by: Brian Hetro <redacted> --- git-commit.sh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/git-commit.sh b/git-commit.sh
index d7e7028..1d04f1f 100755
--- a/git-commit.sh
+++ b/git-commit.sh@@ -49,10 +49,11 @@ run_status () { export GIT_INDEX_FILE fi - case "$status_only" in - t) color= ;; - *) color=--nocolor ;; - esac + if test "$status_only" = "t" -o "$use_status_color" = "t"; then + color= + else + color=--nocolor + fi git runstatus ${color} \ ${verbose:+--verbose} \ ${amend:+--amend} \
@@ -556,6 +557,7 @@ fi if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ] then rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG" + use_status_color=t run_status exit 1 fi
--
1.5.3.rc6.23.g0058-dirty