From 367e27b6f8c229b62177fdc865a5a0a985e75327 Mon Sep 17 00:00:00 2001
From: oGre <ogre@muppfarmen.se>
Date: Tue, 16 Aug 2016 20:53:47 +0200
Subject: [PATCH 1/5] Configurable display of numbers for changed files

---
 gitprompt.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gitprompt.sh b/gitprompt.sh
index 492cd93..8d6045f 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -470,6 +470,12 @@ function updatePrompt() {
     export __GIT_PROMPT_SHOW_UNTRACKED_FILES=${GIT_PROMPT_SHOW_UNTRACKED_FILES}
   fi
 
+  if [ -z "${GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" ]; then
+    export __GIT_PROMPT_SHOW_CHANGED_FILES_COUNT=1
+  else
+    export __GIT_PROMPT_SHOW_CHANGED_FILES_COUNT=${GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}
+  fi
+
   local GIT_INDEX_PRIVATE="$(createPrivateIndex)"
   #important to define GIT_INDEX_FILE as local: This way it only affects this function (and below) - even with the export afterwards
   local GIT_INDEX_FILE
@@ -513,7 +519,9 @@ function updatePrompt() {
         v="\$GIT_$1 $2"
       fi
       if eval "test $v" ; then
-        if [[ $# -lt 2 || "$3" != '-' ]]; then
+        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" ]]; then
+           __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
+        elif [[ $# -lt 2 || "$3" != '-' ]] && [[ "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
           __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
         else
           __add_status "\$GIT_PROMPT_$1\$ResetColor"

From a12e3ccf4483d8f053db953d883edd0bb0be4166 Mon Sep 17 00:00:00 2001
From: oGre <ogre@muppfarmen.se>
Date: Tue, 16 Aug 2016 21:01:38 +0200
Subject: [PATCH 2/5] Simplified if expression

---
 gitprompt.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gitprompt.sh b/gitprompt.sh
index 8d6045f..de42263 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -519,10 +519,8 @@ function updatePrompt() {
         v="\$GIT_$1 $2"
       fi
       if eval "test $v" ; then
-        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" ]]; then
+        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" || "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
            __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
-        elif [[ $# -lt 2 || "$3" != '-' ]] && [[ "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
-          __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
         else
           __add_status "\$GIT_PROMPT_$1\$ResetColor"
         fi

From 12ef3c03636f1aaa3295ba474c25e9fb19924a0d Mon Sep 17 00:00:00 2001
From: oGre <ogre@muppfarmen.se>
Date: Tue, 16 Aug 2016 21:03:33 +0200
Subject: [PATCH 3/5] whitespace

---
 gitprompt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitprompt.sh b/gitprompt.sh
index de42263..b7ceda2 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -520,7 +520,7 @@ function updatePrompt() {
       fi
       if eval "test $v" ; then
         if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" || "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
-           __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
+          __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
         else
           __add_status "\$GIT_PROMPT_$1\$ResetColor"
         fi

From 21ea21f406d8868dbefc0b67d4ae12cbc66dc217 Mon Sep 17 00:00:00 2001
From: oGre <oGre@muppfarmen.se>
Date: Thu, 18 Aug 2016 07:08:37 +0200
Subject: [PATCH 4/5] Changed if statement. Added docs.

---
 README.md    | 2 ++
 gitprompt.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c4bc2db..09262dd 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,8 @@ Add to the `~/.bashrc`:
 
    # GIT_PROMPT_SHOW_UPSTREAM=1 # uncomment to show upstream tracking branch
    # GIT_PROMPT_SHOW_UNTRACKED_FILES=all # can be no, normal or all; determines counting of untracked files
+   
+   # GIT_PROMPT_SHOW_CHANGED_FILES_COUNT=0 # uncomment to avoid printing the number of changed files
 
    # GIT_PROMPT_STATUS_COMMAND=gitstatus_pre-1.7.10.sh # uncomment to support Git older than 1.7.10
 
diff --git a/gitprompt.sh b/gitprompt.sh
index b7ceda2..edd9161 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -519,7 +519,7 @@ function updatePrompt() {
         v="\$GIT_$1 $2"
       fi
       if eval "test $v" ; then
-        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" || "${__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT}" -eq "1" ]]; then
+        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" || "x$__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT" == "x1" ]]; then
           __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
         else
           __add_status "\$GIT_PROMPT_$1\$ResetColor"

From 7d0c2b3061e767f17fa5af95e2efc907ebad8558 Mon Sep 17 00:00:00 2001
From: oGre <oGre@muppfarmen.se>
Date: Thu, 18 Aug 2016 07:11:28 +0200
Subject: [PATCH 5/5] Switched if statement

---
 gitprompt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitprompt.sh b/gitprompt.sh
index edd9161..23f7bc3 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -519,7 +519,7 @@ function updatePrompt() {
         v="\$GIT_$1 $2"
       fi
       if eval "test $v" ; then
-        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$1" == "xREMOTE" || "x$__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT" == "x1" ]]; then
+        if [[ $# -lt 2 || "$3" != '-' ]] && [[ "x$__GIT_PROMPT_SHOW_CHANGED_FILES_COUNT" == "x1" || "x$1" == "xREMOTE" ]]; then
           __add_status "\$GIT_PROMPT_$1\$GIT_$1\$ResetColor"
         else
           __add_status "\$GIT_PROMPT_$1\$ResetColor"