From 61cd6ae2ad8662ad838e269dbad6516c4d9e2e5e Mon Sep 17 00:00:00 2001 From: Johnny Halfmoon Date: Sat, 16 Apr 2016 22:46:46 +0200 Subject: [PATCH] (1) Deleted items were incorrectly counted as staged. (2) A ResetColor string after the last_command_indicator makes the command line colors be a bit more predictable. --- gitprompt.sh | 2 +- gitstatus.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gitprompt.sh b/gitprompt.sh index 684217a..df228ae 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -518,7 +518,7 @@ function updatePrompt() { NEW_PROMPT="$EMPTY_PROMPT" fi - PS1="${NEW_PROMPT//_LAST_COMMAND_INDICATOR_/${LAST_COMMAND_INDICATOR}}" + PS1="${NEW_PROMPT//_LAST_COMMAND_INDICATOR_/${LAST_COMMAND_INDICATOR}${ResetColor}}" } # Helper function that returns virtual env information to be set in prompt diff --git a/gitstatus.sh b/gitstatus.sh index 95e4380..c494878 100755 --- a/gitstatus.sh +++ b/gitstatus.sh @@ -29,6 +29,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do case "$status" in \#\#) branch_line="${line/\.\.\./^}" ;; ?M) ((num_changed++)) ;; + ?D) ((num_changed++)) ;; U?) ((num_conflicts++)) ;; \?\?) ((num_untracked++)) ;; *) ((num_staged++)) ;;