Merge pull request #246 from jhalfmoon/fix/deletedcount-and-lastcommandcolor

fix deleted item count and fix last_command_indicator coloring
master
Martin Gondermann 10 years ago
commit 569574b279
  1. 2
      gitprompt.sh
  2. 1
      gitstatus.sh

@ -518,7 +518,7 @@ function updatePrompt() {
NEW_PROMPT="$EMPTY_PROMPT" NEW_PROMPT="$EMPTY_PROMPT"
fi 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 # Helper function that returns virtual env information to be set in prompt

@ -29,6 +29,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
case "$status" in case "$status" in
\#\#) branch_line="${line/\.\.\./^}" ;; \#\#) branch_line="${line/\.\.\./^}" ;;
?M) ((num_changed++)) ;; ?M) ((num_changed++)) ;;
?D) ((num_changed++)) ;;
U?) ((num_conflicts++)) ;; U?) ((num_conflicts++)) ;;
\?\?) ((num_untracked++)) ;; \?\?) ((num_untracked++)) ;;
*) ((num_staged++)) ;; *) ((num_staged++)) ;;

Loading…
Cancel
Save