[PATCH] bash: offer to show (un)staged changes
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Jan 18, 2009, 00:56 UTC
- Message-ID
- <1232240184-10906-1-git-send-email-trast@student.ethz.ch>
Add a bit of code to __git_ps1 that lets it append '*' to the branch name if there are any uncommitted changes, and '+' if there are any staged changes.
Since this is a rather expensive operation and will force a lot of data into the cache whenever you first enter a repository, you have to enable it manually by setting GIT_PS1_EXPENSIVE to something nonempty.
Signed-off-by: Thomas Rast <trast@student.ethz.ch> ---
I came up with this after sending two incomplete patches on the same night, and really like it. Perhaps others might find it useful.
Of course it would be brilliant if there were a way to ask the kernel if a certain directory is cached, but I couldn't find one, let alone one accessible from the shell.
contrib/completion/git-completion.bash | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f8b845a..36ea528 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -34,6 +34,10 @@ # are currently in a git repository. The %s token will be # the name of the current branch. # +# In addition, if you set GIT_PS1_EXPENSIVE to a nonempty value, +# unstaged (*) and staged (+) changes will be shown next to the +# branch name. +# # To submit patches: # # *) Read Documentation/SubmittingPatches @@ -116,10 +120,23 @@ __git_ps1 () fi fi + local w + local i + + if test ! -z "$GIT_PS1_EXPENSIVE"; then + git update-index --refresh >/dev/null 2>&1 || w="*" + if git rev-parse --quiet --verify HEAD >/dev/null; then + git diff-index --cached --quiet \ + --ignore-submodules HEAD -- || i="+" + else + i="#" + fi + fi + if [ -n "${1-}" ]; then - printf "$1" "${b##refs/heads/}$r" + printf "$1" "${b##refs/heads/}$w$i$r" else - printf " (%s)" "${b##refs/heads/}$r" + printf " (%s)" "${b##refs/heads/}$w$i$r" fi fi }
-- tg: (7bbd8d6..) t/ps1-dirty-state (depends on: origin/master)