bash prompt: remove a redundant 'git diff' option
authorSZEDER Gábor <szeder@ira.uka.de>
Sat, 21 Nov 2015 14:46:40 +0000 (15:46 +0100)
committerJeff King <peff@peff.net>
Tue, 24 Nov 2015 20:27:01 +0000 (15:27 -0500)
To get the dirty state indicator __git_ps1() runs 'git diff' with
'--quiet --exit-code' options. '--quiet' already implies
'--exit-code', so the latter is unnecessary and can be removed.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Jeff King <peff@peff.net>
contrib/completion/git-prompt.sh
index 07b52bedf183231b5708caf1ce255a115c9a980c..7a95fbdcfdbedac1aa4c06b720a356a41fd0b356 100644 (file)
@@ -476,7 +476,7 @@ __git_ps1 ()
                if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
                   [ "$(git config --bool bash.showDirtyState)" != "false" ]
                then
-                       git diff --no-ext-diff --quiet --exit-code || w="*"
+                       git diff --no-ext-diff --quiet || w="*"
                        if [ -n "$short_sha" ]; then
                                git diff-index --cached --quiet HEAD -- || i="+"
                        else