Junio C Hamano [off-list ref] wrote:
Daniel Trstenjak [off-list ref] writes:
quoted
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.
quoted
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 <redacted>
--
Shawn.