From: Benjamin Fuchs <email@benjaminfuchs.de>
To: git@vger.kernel.org
Cc: szeder.dev@gmail.com, sbeller@google.com, email@benjaminfuchs.de
Subject: [PATCH 3/3] git-prompt.sh: fix for submodule 'dirty' indicator
Date: Sun, 22 Jan 2017 20:30:21 +0100 [thread overview]
Message-ID: <1485113421-22264-1-git-send-email-email@benjaminfuchs.de> (raw)
Fixing wrong git diff line.
---
contrib/completion/git-prompt.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index c44b9a2..43b28e9 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -306,9 +306,9 @@ __git_ps1_submodule ()
local submodule_name="$(basename "$git_dir")"
if [ "$submodule_name" != ".git" ] && [ "$submodule_name" != "." ]; then
local parent_top="${git_dir%.git*}"
- local submodule_top="${git_dir#*modules}"
+ local submodule_top="${git_dir#*modules/}"
local status=""
- git diff -C "$parent_top" --no-ext-diff --ignore-submodules=dirty --quiet -- "$submodule_top" 2>/dev/null || status="+"
+ git -C "$parent_top" diff --no-ext-diff --ignore-submodules=dirty --quiet -- "$submodule_top" 2>/dev/null || status="+"
printf "$status$submodule_name:"
fi
}
@@ -544,7 +544,7 @@ __git_ps1 ()
local sub=""
if [ -n "${GIT_PS1_SHOWSUBMODULE}" ]; then
- sub="$(__git_ps1_submodule $g)"
+ sub="$(__git_ps1_submodule "$g")"
fi
local f="$w$i$s$u"
--
2.7.4
next reply other threads:[~2017-01-22 19:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-22 19:30 Benjamin Fuchs [this message]
2017-01-24 1:17 ` [PATCH 3/3] git-prompt.sh: fix for submodule 'dirty' indicator brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485113421-22264-1-git-send-email-email@benjaminfuchs.de \
--to=email@benjaminfuchs.de \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).