# [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" 10 messages from 2013-08-21 to 2013-08-22. Participants: Brandon Casey, Junio C Hamano. Thread: https://gitlist.dev/t/34744 ## Brandon Casey, 2013-08-21 20:49 Subject: [PATCH 1/3] git-completion.bash: use correct Bash/Zsh array length syntax Message-ID: <1377118173-23405-1-git-send-email-bcasey@nvidia.com> URL: https://gitlist.dev/e/1377118173-23405-1-git-send-email-bcasey%40nvidia.com ``` From: Brandon Casey The syntax for retrieving the number of elements in an array is: ${#name[@]} Signed-off-by: Brandon Casey --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 5da920e..e1b7313 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2580,7 +2580,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then --*=*|*.) ;; *) c="$c " ;; esac - array[$#array+1]="$c" + array[${#array[@]}+1]="$c" done compset -P '*[=:]' compadd -Q -S '' -p "${2-}" -a -- array && _ret=0 -- 1.8.4.rc0.2.g6cf5c31 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ----------------------------------------------------------------------------------- ``` ## Brandon Casey, 2013-08-21 20:49 Subject: [PATCH 2/3] t9902-completion.sh: old Bash still does not support array+=('') notation Message-ID: <1377118173-23405-2-git-send-email-bcasey@nvidia.com> URL: https://gitlist.dev/e/1377118173-23405-2-git-send-email-bcasey%40nvidia.com In-Reply-To: <1377118173-23405-1-git-send-email-bcasey@nvidia.com> ``` From: Brandon Casey Old Bash (3.0) which is distributed with RHEL 4.X and other ancient platforms that are still in wide use, does not understand the array+=() notation. Let's use an explicit assignment to the new array element which works everywhere, like: array[${#array[@]}+1]='' The right-hand side '' is not strictly necessary, but in this case I think it is more clear. Signed-off-by: Brandon Casey --- t/t9902-completion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 272a071..2d4beb5 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -69,7 +69,7 @@ run_completion () local -a COMPREPLY _words local _cword _words=( $1 ) - test "${1: -1}" = ' ' && _words+=('') + test "${1: -1}" = ' ' && _words[${#_words[@]}+1]='' (( _cword = ${#_words[@]} - 1 )) __git_wrap__git_main && print_comp } -- 1.8.4.rc0.2.g6cf5c31 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ----------------------------------------------------------------------------------- ``` ## Brandon Casey, 2013-08-21 20:49 Subject: [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" Message-ID: <1377118173-23405-3-git-send-email-bcasey@nvidia.com> URL: https://gitlist.dev/e/1377118173-23405-3-git-send-email-bcasey%40nvidia.com In-Reply-To: <1377118173-23405-1-git-send-email-bcasey@nvidia.com> ``` From: Brandon Casey This reverts commit 69a8141a5d81925b7e08cb228535e9ea4a7a02e3. Old Bash (3.0) which is distributed with RHEL 4.X and other ancient platforms that are still in wide use, does not have a printf that supports -v. Let's revert this patch and go back to using printf in the traditional way. Signed-off-by: Brandon Casey --- contrib/completion/git-prompt.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index a81ef5a..7698ec4 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -433,11 +433,7 @@ __git_ps1 () local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" if [ $pcmode = yes ]; then - if [[ -n ${ZSH_VERSION-} ]]; then - gitstring=$(printf -- "$printf_format" "$gitstring") - else - printf -v gitstring -- "$printf_format" "$gitstring" - fi + gitstring=$(printf -- "$printf_format" "$gitstring") PS1="$ps1pc_start$gitstring$ps1pc_end" else printf -- "$printf_format" "$gitstring" -- 1.8.4.rc0.2.g6cf5c31 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ----------------------------------------------------------------------------------- ``` ## Junio C Hamano, 2013-08-21 21:47 Subject: Re: [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" Message-ID: URL: https://gitlist.dev/e/xmqq7gfeu35g.fsf%40gitster.dls.corp.google.com In-Reply-To: <1377118173-23405-3-git-send-email-bcasey@nvidia.com> ``` Brandon Casey writes: > From: Brandon Casey > > This reverts commit 69a8141a5d81925b7e08cb228535e9ea4a7a02e3. > > Old Bash (3.0) which is distributed with RHEL 4.X and other ancient > platforms that are still in wide use, does not have a printf that > supports -v. Let's revert this patch and go back to using printf > in the traditional way. > > Signed-off-by: Brandon Casey > --- Is this something you can detect at load-time once, store the result in a private variable and then switch on it at runtime, something along the lines of... # on load... printf -v __git_printf_supports_v -- "%s" yes >/dev/null 2>&1 ... if test "${__git_printf_supports_v}" = yes then printf -v gitstring -- "$printf_format" "$gitstring" else gitstring=$(printf -- "$printf_format" "$gitstring") fi > contrib/completion/git-prompt.sh | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh > index a81ef5a..7698ec4 100644 > --- a/contrib/completion/git-prompt.sh > +++ b/contrib/completion/git-prompt.sh > @@ -433,11 +433,7 @@ __git_ps1 () > local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" > > if [ $pcmode = yes ]; then > - if [[ -n ${ZSH_VERSION-} ]]; then > - gitstring=$(printf -- "$printf_format" "$gitstring") > - else > - printf -v gitstring -- "$printf_format" "$gitstring" > - fi > + gitstring=$(printf -- "$printf_format" "$gitstring") > PS1="$ps1pc_start$gitstring$ps1pc_end" > else > printf -- "$printf_format" "$gitstring" ``` ## Brandon Casey, 2013-08-21 22:08 Subject: Re: [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" Message-ID: URL: https://gitlist.dev/e/CA%2BsFfMc0BPo8pSLngi%3DbAWxYNT8xKFEOo77z3a12q%2B-Sq4qiiA%40mail.gmail.com In-Reply-To: ``` On Wed, Aug 21, 2013 at 2:47 PM, Junio C Hamano wrote: > Brandon Casey writes: > >> From: Brandon Casey >> >> This reverts commit 69a8141a5d81925b7e08cb228535e9ea4a7a02e3. >> >> Old Bash (3.0) which is distributed with RHEL 4.X and other ancient >> platforms that are still in wide use, does not have a printf that >> supports -v. Let's revert this patch and go back to using printf >> in the traditional way. >> >> Signed-off-by: Brandon Casey >> --- > > Is this something you can detect at load-time once, store the result > in a private variable and then switch on it at runtime, something > along the lines of... > > > # on load... > printf -v __git_printf_supports_v -- "%s" yes >/dev/null 2>&1 > > ... > > if test "${__git_printf_supports_v}" = yes > then > printf -v gitstring -- "$printf_format" "$gitstring" > else > gitstring=$(printf -- "$printf_format" "$gitstring") > fi Yes, that appears to work. -Brandon >> contrib/completion/git-prompt.sh | 6 +----- >> 1 file changed, 1 insertion(+), 5 deletions(-) >> >> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh >> index a81ef5a..7698ec4 100644 >> --- a/contrib/completion/git-prompt.sh >> +++ b/contrib/completion/git-prompt.sh >> @@ -433,11 +433,7 @@ __git_ps1 () >> local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" >> >> if [ $pcmode = yes ]; then >> - if [[ -n ${ZSH_VERSION-} ]]; then >> - gitstring=$(printf -- "$printf_format" "$gitstring") >> - else >> - printf -v gitstring -- "$printf_format" "$gitstring" >> - fi >> + gitstring=$(printf -- "$printf_format" "$gitstring") >> PS1="$ps1pc_start$gitstring$ps1pc_end" >> else >> printf -- "$printf_format" "$gitstring" ``` ## Junio C Hamano, 2013-08-22 00:22 Subject: Re: [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" Message-ID: URL: https://gitlist.dev/e/xmqq7gfesheu.fsf%40gitster.dls.corp.google.com In-Reply-To: ``` Brandon Casey writes: > On Wed, Aug 21, 2013 at 2:47 PM, Junio C Hamano wrote: >> Brandon Casey writes: >> >>> From: Brandon Casey >>> >>> This reverts commit 69a8141a5d81925b7e08cb228535e9ea4a7a02e3. >>> >>> Old Bash (3.0) which is distributed with RHEL 4.X and other ancient >>> platforms that are still in wide use, does not have a printf that >>> supports -v. Let's revert this patch and go back to using printf >>> in the traditional way. >>> >>> Signed-off-by: Brandon Casey >>> --- >> >> Is this something you can detect at load-time once, store the result >> in a private variable and then switch on it at runtime, something >> along the lines of... >> >> >> # on load... >> printf -v __git_printf_supports_v -- "%s" yes >/dev/null 2>&1 >> >> ... >> >> if test "${__git_printf_supports_v}" = yes >> then >> printf -v gitstring -- "$printf_format" "$gitstring" >> else >> gitstring=$(printf -- "$printf_format" "$gitstring") >> fi > > Yes, that appears to work. A real patch needs to be a bit more careful, though. The variable needs to be cleared before all of the above, and the testing would want to consider that the variable may not be set (i.e. use "${var-}" when checking). Thanks. > -Brandon > > >>> contrib/completion/git-prompt.sh | 6 +----- >>> 1 file changed, 1 insertion(+), 5 deletions(-) >>> >>> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh >>> index a81ef5a..7698ec4 100644 >>> --- a/contrib/completion/git-prompt.sh >>> +++ b/contrib/completion/git-prompt.sh >>> @@ -433,11 +433,7 @@ __git_ps1 () >>> local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" >>> >>> if [ $pcmode = yes ]; then >>> - if [[ -n ${ZSH_VERSION-} ]]; then >>> - gitstring=$(printf -- "$printf_format" "$gitstring") >>> - else >>> - printf -v gitstring -- "$printf_format" "$gitstring" >>> - fi >>> + gitstring=$(printf -- "$printf_format" "$gitstring") >>> PS1="$ps1pc_start$gitstring$ps1pc_end" >>> else >>> printf -- "$printf_format" "$gitstring" ``` ## Brandon Casey, 2013-08-22 00:33 Subject: Re: [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" Message-ID: URL: https://gitlist.dev/e/CA%2BsFfMfa422PF1inOOeTBRE7HRqL5zwCJNagx9Ya0i_LbpwQcg%40mail.gmail.com In-Reply-To: ``` On Wed, Aug 21, 2013 at 5:22 PM, Junio C Hamano wrote: > Brandon Casey writes: > >> On Wed, Aug 21, 2013 at 2:47 PM, Junio C Hamano wrote: >>> # on load... >>> printf -v __git_printf_supports_v -- "%s" yes >/dev/null 2>&1 >>> >>> ... >>> >>> if test "${__git_printf_supports_v}" = yes >>> then >>> printf -v gitstring -- "$printf_format" "$gitstring" >>> else >>> gitstring=$(printf -- "$printf_format" "$gitstring") >>> fi >> >> Yes, that appears to work. > > A real patch needs to be a bit more careful, though. The variable > needs to be cleared before all of the above, Agreed. > and the testing would > want to consider that the variable may not be set (i.e. use > "${var-}" when checking). Why is "${var-}" necessary? Wouldn't that be equivalent to "${var}" or "$var"? We obviously wouldn't want to do 'if test $var = yes', but I would have thought it was sufficient to wrap the variable dereference in quotes as your original did. -Brandon ``` ## Brandon Casey, 2013-08-22 01:17 Subject: [PATCH] contrib/git-prompt.sh: handle missing 'printf -v' more gracefully Message-ID: <1377134242-15012-1-git-send-email-bcasey@nvidia.com> URL: https://gitlist.dev/e/1377134242-15012-1-git-send-email-bcasey%40nvidia.com In-Reply-To: ``` From: Brandon Casey Old Bash (3.0) which is distributed with RHEL 4.X and other ancient platforms that are still in wide use, do not have a printf that supports -v. Neither does Zsh (which is already handled in the code). As suggested by Junio, let's test whether printf supports the -v option and store the result. Then later, we can use it to determine whether 'printf -v' can be used, or whether printf must be called in a subshell. Signed-off-by: Brandon Casey --- This replaces [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring". This may or may not need to be updated to use "${var-}" depending on your response to my other email, but this seems sufficient. -Brandon contrib/completion/git-prompt.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index a81ef5a..639888a 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -84,6 +84,10 @@ # the colored output of "git status -sb" and are available only when # using __git_ps1 for PROMPT_COMMAND or precmd. +# check whether printf supports -v +__git_printf_supports_v= +printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1 + # stores the divergence from upstream in $p # used by GIT_PS1_SHOWUPSTREAM __git_ps1_show_upstream () @@ -433,10 +437,10 @@ __git_ps1 () local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" if [ $pcmode = yes ]; then - if [[ -n ${ZSH_VERSION-} ]]; then - gitstring=$(printf -- "$printf_format" "$gitstring") - else + if test "$__git_printf_supports_v" = yes; then printf -v gitstring -- "$printf_format" "$gitstring" + else + gitstring=$(printf -- "$printf_format" "$gitstring") fi PS1="$ps1pc_start$gitstring$ps1pc_end" else -- 1.8.4.rc0.2.g6cf5c31 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ----------------------------------------------------------------------------------- ``` ## Junio C Hamano, 2013-08-22 01:27 Subject: Re: [PATCH 3/3] Revert "bash prompt: avoid command substitution when finalizing gitstring" Message-ID: URL: https://gitlist.dev/e/xmqq38q2sefa.fsf%40gitster.dls.corp.google.com In-Reply-To: ``` Brandon Casey writes: > Why is "${var-}" necessary? Wouldn't that be equivalent to "${var}" > or "$var"? set -u ``` ## Brandon Casey, 2013-08-22 01:39 Subject: [PATCH] contrib/git-prompt.sh: handle missing 'printf -v' more gracefully Message-ID: <1377135543-19053-1-git-send-email-bcasey@nvidia.com> URL: https://gitlist.dev/e/1377135543-19053-1-git-send-email-bcasey%40nvidia.com In-Reply-To: <1377134242-15012-1-git-send-email-bcasey@nvidia.com> ``` From: Brandon Casey Old Bash (3.0) which is distributed with RHEL 4.X and other ancient platforms that are still in wide use, do not have a printf that supports -v. Neither does Zsh (which is already handled in the code). As suggested by Junio, let's test whether printf supports the -v option and store the result. Then later, we can use it to determine whether 'printf -v' can be used, or whether printf must be called in a subshell. Signed-off-by: Brandon Casey --- On 8/21/2013 6:27 PM, Junio C Hamano wrote:> Brandon Casey writes: > >> Why is "${var-}" necessary? Wouldn't that be equivalent to "${var}" >> or "$var"? > > set -u Ah. Thanks. Updated. Also minor tweak to use [ ] instead of test ... to conform with the rest of the script. -Brandon contrib/completion/git-prompt.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index a81ef5a..ca7fb35 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -84,6 +84,10 @@ # the colored output of "git status -sb" and are available only when # using __git_ps1 for PROMPT_COMMAND or precmd. +# check whether printf supports -v +__git_printf_supports_v= +printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1 + # stores the divergence from upstream in $p # used by GIT_PS1_SHOWUPSTREAM __git_ps1_show_upstream () @@ -433,10 +437,10 @@ __git_ps1 () local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" if [ $pcmode = yes ]; then - if [[ -n ${ZSH_VERSION-} ]]; then - gitstring=$(printf -- "$printf_format" "$gitstring") - else + if [ "${__git_printf_supports_v-}" = yes ]; then printf -v gitstring -- "$printf_format" "$gitstring" + else + gitstring=$(printf -- "$printf_format" "$gitstring") fi PS1="$ps1pc_start$gitstring$ps1pc_end" else -- 1.8.4.rc0.2.g6cf5c31 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ----------------------------------------------------------------------------------- ```