* [PATCH] Show the presence of untracked files in the bash prompt.
@ 2009-07-21 17:14 Daniel Trstenjak
2009-07-21 17:19 ` Shawn O. Pearce
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Trstenjak @ 2009-07-21 17:14 UTC (permalink / raw)
To: git; +Cc: Daniel Trstenjak
Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'.
When set to a nonempty value, then the char '%' will be shown next
to the branch name in the bash prompt.
Signed-off-by: Daniel Trstenjak <daniel.trstenjak@science-computing.de>
---
contrib/completion/git-completion.bash | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 887731e..4c0f7d2 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -44,6 +44,10 @@
# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
# then a '$' will be shown next to the branch name.
#
+# If you would like to see if there're untracked files, then you can
+# set GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're
+# untracked files, then a '%' will be shown next to the branch name.
+#
# To submit patches:
#
# *) Read Documentation/SubmittingPatches
@@ -132,6 +136,7 @@ __git_ps1 ()
local w
local i
local s
+ local u
local c
if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
@@ -156,12 +161,19 @@ __git_ps1 ()
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
fi
+
+ if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
+ local num_untracked_files=$(git ls-files --others --exclude-standard | wc -l)
+ if [ $num_untracked_files -gt "0" ]; then
+ u="%"
+ fi
+ fi
fi
if [ -n "${1-}" ]; then
- printf "$1" "$c${b##refs/heads/}$w$i$s$r"
+ printf "$1" "$c${b##refs/heads/}$w$i$s$u$r"
else
- printf " (%s)" "$c${b##refs/heads/}$w$i$s$r"
+ printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r"
fi
fi
}
--
1.6.2
--
Daniel Trstenjak Tel : +49 (0)7071-9457-264
science + computing ag FAX : +49 (0)7071-9457-511
Hagellocher Weg 73 mailto: Daniel.Trstenjak@science-computing.de
D-72070 Tübingen WWW : http://www.science-computing.de/
--
Vorstand/Board of Management:
Dr. Bernd Finkbeiner, Dr. Roland Niemeier,
Dr. Arno Steitz, Dr. Ingrid Zech
Vorsitzender des Aufsichtsrats/
Chairman of the Supervisory Board:
Michel Lepert
Sitz/Registered Office: Tuebingen
Registergericht/Registration Court: Stuttgart
Registernummer/Commercial Register No.: HRB 382196
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Show the presence of untracked files in the bash prompt.
2009-07-21 17:14 [PATCH] Show the presence of untracked files in the bash prompt Daniel Trstenjak
@ 2009-07-21 17:19 ` Shawn O. Pearce
2009-07-22 8:31 ` Daniel Trstenjak
0 siblings, 1 reply; 4+ messages in thread
From: Shawn O. Pearce @ 2009-07-21 17:19 UTC (permalink / raw)
To: Daniel Trstenjak; +Cc: git, Daniel Trstenjak
Daniel Trstenjak <daniel.trstenjak@science-computing.de> wrote:
> Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'.
> When set to a nonempty value, then the char '%' will be shown next
> to the branch name in the bash prompt.
> @@ -156,12 +161,19 @@ __git_ps1 ()
> if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
> git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
> fi
> +
> + if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
> + local num_untracked_files=$(git ls-files --others --exclude-standard | wc -l)
> + if [ $num_untracked_files -gt "0" ]; then
Wouldn't using -n be easier here?
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
--
Shawn.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Show the presence of untracked files in the bash prompt.
2009-07-21 17:19 ` Shawn O. Pearce
@ 2009-07-22 8:31 ` Daniel Trstenjak
2009-07-24 15:03 ` Shawn O. Pearce
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Trstenjak @ 2009-07-22 8:31 UTC (permalink / raw)
To: git; +Cc: Daniel Trstenjak
Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'.
When set to a nonempty value, then the char '%' will be shown next
to the branch name in the bash prompt.
Signed-off-by: Daniel Trstenjak <daniel.trstenjak@science-computing.de>
---
contrib/completion/git-completion.bash | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 887731e..745b5fb 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -44,6 +44,10 @@
# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
# then a '$' will be shown next to the branch name.
#
+# If you would like to see if there're untracked files, then you can
+# set GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're
+# untracked files, then a '%' will be shown next to the branch name.
+#
# To submit patches:
#
# *) Read Documentation/SubmittingPatches
@@ -132,6 +136,7 @@ __git_ps1 ()
local w
local i
local s
+ local u
local c
if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
@@ -156,12 +161,18 @@ __git_ps1 ()
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
fi
+
+ if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
+ if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+ u="%"
+ fi
+ fi
fi
if [ -n "${1-}" ]; then
- printf "$1" "$c${b##refs/heads/}$w$i$s$r"
+ printf "$1" "$c${b##refs/heads/}$w$i$s$u$r"
else
- printf " (%s)" "$c${b##refs/heads/}$w$i$s$r"
+ printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r"
fi
fi
}
--
1.6.2
--
Daniel Trstenjak Tel : +49 (0)7071-9457-264
science + computing ag FAX : +49 (0)7071-9457-511
Hagellocher Weg 73 mailto: Daniel.Trstenjak@science-computing.de
D-72070 Tübingen WWW : http://www.science-computing.de/
--
Vorstand/Board of Management:
Dr. Bernd Finkbeiner, Dr. Roland Niemeier,
Dr. Arno Steitz, Dr. Ingrid Zech
Vorsitzender des Aufsichtsrats/
Chairman of the Supervisory Board:
Michel Lepert
Sitz/Registered Office: Tuebingen
Registergericht/Registration Court: Stuttgart
Registernummer/Commercial Register No.: HRB 382196
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Show the presence of untracked files in the bash prompt.
2009-07-22 8:31 ` Daniel Trstenjak
@ 2009-07-24 15:03 ` Shawn O. Pearce
0 siblings, 0 replies; 4+ messages in thread
From: Shawn O. Pearce @ 2009-07-24 15:03 UTC (permalink / raw)
To: Daniel Trstenjak, Junio C Hamano; +Cc: git, Daniel Trstenjak
Daniel Trstenjak <trsten@science-computing.de> wrote:
>
> Added the envvar GIT_PS1_SHOWUNTRACKEDFILES to 'git-completion.bash'.
> When set to a nonempty value, then the char '%' will be shown next
> to the branch name in the bash prompt.
>
> Signed-off-by: Daniel Trstenjak <daniel.trstenjak@science-computing.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
> ---
> contrib/completion/git-completion.bash | 15 +++++++++++++--
> 1 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 887731e..745b5fb 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -44,6 +44,10 @@
> # GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
> # then a '$' will be shown next to the branch name.
> #
> +# If you would like to see if there're untracked files, then you can
> +# set GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're
> +# untracked files, then a '%' will be shown next to the branch name.
> +#
> # To submit patches:
> #
> # *) Read Documentation/SubmittingPatches
> @@ -132,6 +136,7 @@ __git_ps1 ()
> local w
> local i
> local s
> + local u
> local c
>
> if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
> @@ -156,12 +161,18 @@ __git_ps1 ()
> if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
> git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
> fi
> +
> + if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
> + if [ -n "$(git ls-files --others --exclude-standard)" ]; then
> + u="%"
> + fi
> + fi
> fi
>
> if [ -n "${1-}" ]; then
> - printf "$1" "$c${b##refs/heads/}$w$i$s$r"
> + printf "$1" "$c${b##refs/heads/}$w$i$s$u$r"
> else
> - printf " (%s)" "$c${b##refs/heads/}$w$i$s$r"
> + printf " (%s)" "$c${b##refs/heads/}$w$i$s$u$r"
> fi
> fi
> }
> --
> 1.6.2
>
>
> --
>
> Daniel Trstenjak Tel : +49 (0)7071-9457-264
> science + computing ag FAX : +49 (0)7071-9457-511
> Hagellocher Weg 73 mailto: Daniel.Trstenjak@science-computing.de
> D-72070 T?bingen WWW : http://www.science-computing.de/
> --
> Vorstand/Board of Management:
> Dr. Bernd Finkbeiner, Dr. Roland Niemeier,
> Dr. Arno Steitz, Dr. Ingrid Zech
> Vorsitzender des Aufsichtsrats/
> Chairman of the Supervisory Board:
> Michel Lepert
> Sitz/Registered Office: Tuebingen
> Registergericht/Registration Court: Stuttgart
> Registernummer/Commercial Register No.: HRB 382196
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Shawn.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-24 15:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-21 17:14 [PATCH] Show the presence of untracked files in the bash prompt Daniel Trstenjak
2009-07-21 17:19 ` Shawn O. Pearce
2009-07-22 8:31 ` Daniel Trstenjak
2009-07-24 15:03 ` Shawn O. Pearce
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).