git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: git@vger.kernel.org, "Shawn O. Pearce" <spearce@spearce.org>
Cc: Junio C Hamano <junio@pobox.com>
Subject: [PATCH v2] bash: offer to show (un)staged changes
Date: Sun,  1 Feb 2009 23:13:43 +0100	[thread overview]
Message-ID: <1233526423-30694-1-git-send-email-trast@student.ethz.ch> (raw)
In-Reply-To: <1232401089-27512-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 unstaged 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 bash.showDirtyState to a true value.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

This got no replies... was there anything wrong with v2?


 contrib/completion/git-completion.bash |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f8b845a..7864ca7 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 bash.showDirtyState to a true value,
+#	unstaged (*) and staged (+) changes will be shown next to the
+#	branch name.
+#
 # To submit patches:
 #
 #    *) Read Documentation/SubmittingPatches
@@ -116,10 +120,24 @@ __git_ps1 ()
 			fi
 		fi
 
+		local w
+		local i
+
+		if test "$(git config --bool bash.showDirtyState)" = "true"; then
+			git diff --no-ext-diff --ignore-submodules \
+				--quiet --exit-code || 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)

  reply	other threads:[~2009-02-01 22:15 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-18  0:56 [PATCH] bash: offer to show (un)staged changes Thomas Rast
2009-01-18  1:53 ` Junio C Hamano
2009-01-18  2:06   ` Thomas Rast
2009-01-19 17:29   ` Shawn O. Pearce
2009-01-19 18:00     ` Martin Langhoff
2009-01-19 18:11       ` Shawn O. Pearce
2009-01-19 18:28         ` Mike Hommey
2009-01-19 18:42         ` Martin Langhoff
2009-01-19 19:06       ` Boyd Stephen Smith Jr.
2009-01-19 19:12         ` Martin Langhoff
2009-01-19 19:01     ` Boyd Stephen Smith Jr.
2009-01-19 21:38     ` [PATCH v2] " Thomas Rast
2009-02-01 22:13       ` Thomas Rast [this message]
2009-02-01 22:29         ` Shawn O. Pearce
2009-02-03  9:20           ` [PATCH v3] " Thomas Rast
2009-02-03 18:11             ` Shawn O. Pearce
2009-02-01 22:48     ` [PATCH] " Tuncer Ayaz
2009-02-01 23:43       ` Junio C Hamano
2009-02-02  0:50         ` Tuncer Ayaz
2009-02-02 19:31           ` Tuncer Ayaz
2009-01-18  2:13 ` Junio C Hamano
2009-01-18  2:32   ` Thomas Rast

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=1233526423-30694-1-git-send-email-trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=junio@pobox.com \
    --cc=spearce@spearce.org \
    /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).