# [PATCH] Show presense of stashed changes in bash prompt. 5 messages from 2009-06-02 to 2009-06-02. Participants: Daniel Trstenjak, Shawn O. Pearce, Jakub Narebski. Thread: https://gitlist.dev/t/19635 ## Daniel Trstenjak, 2009-06-02 11:43 Subject: [PATCH] Show presense of stashed changes in bash prompt. Message-ID: <20090602114325.GA3427@laptop> URL: https://gitlist.dev/e/20090602114325.GA3427%40laptop ``` Avoid the forgetting of stashed changes by showing them in the bash prompt. If the presense is shown is configurable by setting GIT_PS1_SHOW_STASH_STATE to a nonempty value. The code for checking if the stash has entries is taken from 'git-stash.sh'. Signed-off-by: Daniel Trstenjak --- contrib/completion/git-completion.bash | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98b9cbe..ed0c463 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -40,6 +40,10 @@ # with the bash.showDirtyState variable, which defaults to true # once GIT_PS1_SHOWDIRTYSTATE is enabled. # +# You can also see if currently something is stashed, by setting +# GIT_PS1_SHOW_STASH_STATE to a nonempty value. If something is stashed, +# then a '$' will be shown next to the branch name. +# # To submit patches: # # *) Read Documentation/SubmittingPatches @@ -127,6 +131,7 @@ __git_ps1 () local w local i + local s local c if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then @@ -148,12 +153,15 @@ __git_ps1 () fi fi fi + if [ -n "${GIT_PS1_SHOW_STASH_STATE-}" ]; then + git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$" + fi fi if [ -n "${1-}" ]; then - printf "$1" "$c${b##refs/heads/}$w$i$r" + printf "$1" "$c${b##refs/heads/}$w$i$s$r" else - printf " (%s)" "$c${b##refs/heads/}$w$i$r" + printf " (%s)" "$c${b##refs/heads/}$w$i$s$r" fi fi } -- 1.6.1.2 ``` ## Shawn O. Pearce, 2009-06-02 15:29 Subject: Re: [PATCH] Show presense of stashed changes in bash prompt. Message-ID: <20090602152915.GK30527@spearce.org> URL: https://gitlist.dev/e/20090602152915.GK30527%40spearce.org In-Reply-To: <7vzlcqfyli.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano wrote: > Daniel Trstenjak writes: > > Avoid the forgetting of stashed changes by showing > > them in the bash prompt. > > > > If the presense is shown is configurable by setting > > GIT_PS1_SHOW_STASH_STATE to a nonempty value. > > Why am I getting this deja-vu feeling about this patch, I wonder... Is > this a re-roll of a previously posted patch? I don't know... I had a similar deja-vu feeling when I read it. > Shawn? Initial NAK, see below for the nit. > > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > > index 98b9cbe..ed0c463 100755 > > --- a/contrib/completion/git-completion.bash > > +++ b/contrib/completion/git-completion.bash > > @@ -40,6 +40,10 @@ > > # with the bash.showDirtyState variable, which defaults to true > > # once GIT_PS1_SHOWDIRTYSTATE is enabled. > > # > > +# You can also see if currently something is stashed, by setting > > +# GIT_PS1_SHOW_STASH_STATE to a nonempty value. If something is stashed, > > +# then a '$' will be shown next to the branch name. > > +# Can we call this GIT_PS1_SHOWSTASHSTATE to match the already present GIT_PS1_SHOWDIRTYSTATE in at least style formatting? The bike shed already sailed... GIT_PS1_SHOWDIRTYSTATE shipped in 1.6.3. Lets keep the same style. Otherwise it looks fine to me, when you resend you can add my Acked-by: Shawn O. Pearce -- Shawn. ``` ## Daniel Trstenjak, 2009-06-02 18:03 Subject: Re: [PATCH] Show presense of stashed changes in bash prompt. Message-ID: <20090602180322.GA5719@laptop> URL: https://gitlist.dev/e/20090602180322.GA5719%40laptop In-Reply-To: <20090602152915.GK30527@spearce.org> ``` Avoid the forgetting of stashed changes by showing them in the bash prompt. If the presense is shown is configurable by setting GIT_PS1_SHOWSTASHSTATE to a nonempty value. The code for checking if the stash has entries is taken from 'git-stash.sh'. Signed-off-by: Daniel Trstenjak Acked-by: Shawn O. Pearce --- contrib/completion/git-completion.bash | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98b9cbe..c4ae423 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -40,6 +40,10 @@ # with the bash.showDirtyState variable, which defaults to true # once GIT_PS1_SHOWDIRTYSTATE is enabled. # +# You can also see if currently something is stashed, by setting +# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed, +# then a '$' will be shown next to the branch name. +# # To submit patches: # # *) Read Documentation/SubmittingPatches @@ -127,6 +131,7 @@ __git_ps1 () local w local i + local s local c if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then @@ -148,12 +153,15 @@ __git_ps1 () fi fi fi + if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then + git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$" + fi fi if [ -n "${1-}" ]; then - printf "$1" "$c${b##refs/heads/}$w$i$r" + printf "$1" "$c${b##refs/heads/}$w$i$s$r" else - printf " (%s)" "$c${b##refs/heads/}$w$i$r" + printf " (%s)" "$c${b##refs/heads/}$w$i$s$r" fi fi } -- 1.6.1.2 ``` ## Daniel Trstenjak, 2009-06-02 18:04 Subject: Re: [PATCH] Show presense of stashed changes in bash prompt. Message-ID: <20090602180439.GB5719@laptop> URL: https://gitlist.dev/e/20090602180439.GB5719%40laptop In-Reply-To: <7vzlcqfyli.fsf@alter.siamese.dyndns.org> ``` > Why am I getting this deja-vu feeling about this patch, I wonder... Is > this a re-roll of a previously posted patch? Yup. Greetings, Daniel ``` ## Jakub Narebski, 2009-06-02 18:36 Subject: Re: [PATCH] Show presense of stashed changes in bash prompt. Message-ID: URL: https://gitlist.dev/e/h03rfk%24t5l%241%40ger.gmane.org In-Reply-To: <20090602180322.GA5719@laptop> ``` Daniel Trstenjak wrote: > If the presense is shown is configurable by setting > GIT_PS1_SHOWSTASHSTATE to a nonempty value. _presence_ -- Jakub Narebski Warsaw, Poland ShadeHawk on #git ```