* [PATCH] completion: fix issue with process substitution not working on Git for Windows
@ 2011-10-25 18:01 Stefan Naewe
2011-10-25 20:39 ` Johannes Sixt
0 siblings, 1 reply; 10+ messages in thread
From: Stefan Naewe @ 2011-10-25 18:01 UTC (permalink / raw)
To: spearce; +Cc: git, gitster, Stefan Naewe
Git for Windows comes with a bash that doesn't support process substitution.
It issues the following error when using git-completion.bash with
GIT_PS1_SHOWUPSTREAM set:
$ export GIT_PS1_SHOWUPSTREAM=1
sh.exe": cannot make pipe for process substitution: Function not implemented
sh.exe": cannot make pipe for process substitution: Function not implemented
sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
Replace the process substitution with a simple "echo $var | while...".
Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
---
contrib/completion/git-completion.bash | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8648a36..926db80 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -110,6 +110,8 @@ __git_ps1_show_upstream ()
local upstream=git legacy="" verbose=""
# get some config options from git-config
+ output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
+ echo "$output" | \
while read key value; do
case "$key" in
bash.showupstream)
@@ -125,7 +127,7 @@ __git_ps1_show_upstream ()
upstream=svn+git # default upstream is SVN if available, else git
;;
esac
- done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
+ done
# parse configuration values
for option in ${GIT_PS1_SHOWUPSTREAM}; do
--
1.7.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] completion: fix issue with process substitution not working on Git for Windows
2011-10-25 18:01 [PATCH] completion: fix issue with process substitution not working on Git for Windows Stefan Naewe
@ 2011-10-25 20:39 ` Johannes Sixt
2011-10-26 6:52 ` Stefan Näwe
0 siblings, 1 reply; 10+ messages in thread
From: Johannes Sixt @ 2011-10-25 20:39 UTC (permalink / raw)
To: Stefan Naewe; +Cc: spearce, git, gitster
Am 25.10.2011 20:01, schrieb Stefan Naewe:
> Git for Windows comes with a bash that doesn't support process substitution.
> It issues the following error when using git-completion.bash with
> GIT_PS1_SHOWUPSTREAM set:
>
> $ export GIT_PS1_SHOWUPSTREAM=1
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
>
> Replace the process substitution with a simple "echo $var | while...".
>
> Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
> ---
> contrib/completion/git-completion.bash | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 8648a36..926db80 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -110,6 +110,8 @@ __git_ps1_show_upstream ()
> local upstream=git legacy="" verbose=""
>
> # get some config options from git-config
> + output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
> + echo "$output" | \
> while read key value; do
> case "$key" in
> bash.showupstream)
> @@ -125,7 +127,7 @@ __git_ps1_show_upstream ()
> upstream=svn+git # default upstream is SVN if available, else git
> ;;
> esac
> - done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
> + done
>
> # parse configuration values
> for option in ${GIT_PS1_SHOWUPSTREAM}; do
Are you sure that the result still works as intended? The while loop
sets a few variables. When you place it in a pipe, the loop runs in a
subshell, and subsequent code will not see the modified values. Unless
bash knows how to optimize away the subshell, that is.
OTOH, when you use while ...; do ...; done < <(...), the while loop is
not in a subshell.
An alternative is to use: while ...; do ...; done <<< "$output"
BTW, you don't need to protect the end-of-line with a backslash if the
line ends with the pipe symbol.
-- Hannes
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] completion: fix issue with process substitution not working on Git for Windows
2011-10-25 20:39 ` Johannes Sixt
@ 2011-10-26 6:52 ` Stefan Näwe
2011-10-26 19:13 ` [PATCH v2] " Stefan Naewe
0 siblings, 1 reply; 10+ messages in thread
From: Stefan Näwe @ 2011-10-26 6:52 UTC (permalink / raw)
To: Johannes Sixt; +Cc: spearce, git, gitster
Am 25. Oktober 2011 22:39 schrieb Johannes Sixt <j6t@kdbg.org>:
> Am 25.10.2011 20:01, schrieb Stefan Naewe:
>> Git for Windows comes with a bash that doesn't support process substitution.
>> It issues the following error when using git-completion.bash with
>> GIT_PS1_SHOWUPSTREAM set:
>>
>> $ export GIT_PS1_SHOWUPSTREAM=1
>> sh.exe": cannot make pipe for process substitution: Function not implemented
>> sh.exe": cannot make pipe for process substitution: Function not implemented
>> sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
>>
>> Replace the process substitution with a simple "echo $var | while...".
>>
>> Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
>> ---
>> contrib/completion/git-completion.bash | 4 +++-
>> 1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index 8648a36..926db80 100755
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -110,6 +110,8 @@ __git_ps1_show_upstream ()
>> local upstream=git legacy="" verbose=""
>>
>> # get some config options from git-config
>> + output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
>> + echo "$output" | \
>> while read key value; do
>> case "$key" in
>> bash.showupstream)
>> @@ -125,7 +127,7 @@ __git_ps1_show_upstream ()
>> upstream=svn+git # default upstream is SVN if available, else git
>> ;;
>> esac
>> - done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
>> + done
>>
>> # parse configuration values
>> for option in ${GIT_PS1_SHOWUPSTREAM}; do
>
> Are you sure that the result still works as intended? The while loop
> sets a few variables. When you place it in a pipe, the loop runs in a
> subshell, and subsequent code will not see the modified values. Unless
> bash knows how to optimize away the subshell, that is.
I doesn't work in the 'git svn' case, I guess.
> OTOH, when you use while ...; do ...; done < <(...), the while loop is
> not in a subshell.
>
> An alternative is to use: while ...; do ...; done <<< "$output"
I'll try that.
> BTW, you don't need to protect the end-of-line with a backslash if the
> line ends with the pipe symbol.
OK. Will do.
> -- Hannes
Thanks,
Stefan
--
----------------------------------------------------------------
python -c "print '73746566616e2e6e6165776540676d61696c2e636f6d'.decode('hex')"
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-26 6:52 ` Stefan Näwe
@ 2011-10-26 19:13 ` Stefan Naewe
2011-10-26 20:02 ` Junio C Hamano
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Stefan Naewe @ 2011-10-26 19:13 UTC (permalink / raw)
To: spearce; +Cc: git, gitster, Stefan Naewe
Git for Windows comes with a bash that doesn't support process substitution.
It issues the following error when using git-completion.bash with
GIT_PS1_SHOWUPSTREAM set:
$ export GIT_PS1_SHOWUPSTREAM=1
sh.exe": cannot make pipe for process substitution: Function not implemented
sh.exe": cannot make pipe for process substitution: Function not implemented
sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
Replace the process substitution with a 'here string'.
Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
---
contrib/completion/git-completion.bash | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8648a36..0b3d47e 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -110,6 +110,7 @@ __git_ps1_show_upstream ()
local upstream=git legacy="" verbose=""
# get some config options from git-config
+ output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
while read key value; do
case "$key" in
bash.showupstream)
@@ -125,7 +126,7 @@ __git_ps1_show_upstream ()
upstream=svn+git # default upstream is SVN if available, else git
;;
esac
- done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
+ done <<< "$output"
# parse configuration values
for option in ${GIT_PS1_SHOWUPSTREAM}; do
--
1.7.7.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-26 19:13 ` [PATCH v2] " Stefan Naewe
@ 2011-10-26 20:02 ` Junio C Hamano
2011-10-26 21:07 ` Junio C Hamano
2011-10-27 9:05 ` SZEDER Gábor
2 siblings, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2011-10-26 20:02 UTC (permalink / raw)
To: Stefan Naewe; +Cc: spearce, git
Stefan Naewe <stefan.naewe@gmail.com> writes:
> Git for Windows comes with a bash that doesn't support process substitution.
> It issues the following error when using git-completion.bash with
> GIT_PS1_SHOWUPSTREAM set:
>
> $ export GIT_PS1_SHOWUPSTREAM=1
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
>
> Replace the process substitution with a 'here string'.
>
> Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Yuck, but I honestly shouldn't care about the yuckiness as this script is
inherently intimately dependent on bash anyway ;-).
> contrib/completion/git-completion.bash | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 8648a36..0b3d47e 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -110,6 +110,7 @@ __git_ps1_show_upstream ()
> local upstream=git legacy="" verbose=""
>
> # get some config options from git-config
> + output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
> while read key value; do
> case "$key" in
> bash.showupstream)
> @@ -125,7 +126,7 @@ __git_ps1_show_upstream ()
> upstream=svn+git # default upstream is SVN if available, else git
> ;;
> esac
> - done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
> + done <<< "$output"
>
> # parse configuration values
> for option in ${GIT_PS1_SHOWUPSTREAM}; do
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-26 19:13 ` [PATCH v2] " Stefan Naewe
2011-10-26 20:02 ` Junio C Hamano
@ 2011-10-26 21:07 ` Junio C Hamano
2011-10-27 6:26 ` Stefan Näwe
2011-10-27 9:05 ` SZEDER Gábor
2 siblings, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2011-10-26 21:07 UTC (permalink / raw)
To: Stefan Naewe; +Cc: spearce, git
Stefan Naewe <stefan.naewe@gmail.com> writes:
> $ export GIT_PS1_SHOWUPSTREAM=1
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
Are these the exact strings you want to have in the commit log message? I
am particularly wondering about the dq after (but not around) 'sh.exe'.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-26 21:07 ` Junio C Hamano
@ 2011-10-27 6:26 ` Stefan Näwe
0 siblings, 0 replies; 10+ messages in thread
From: Stefan Näwe @ 2011-10-27 6:26 UTC (permalink / raw)
To: Junio C Hamano; +Cc: spearce, git
Am 26. Oktober 2011 23:07 schrieb Junio C Hamano <gitster@pobox.com>:
> Stefan Naewe <stefan.naewe@gmail.com> writes:
>
>> $ export GIT_PS1_SHOWUPSTREAM=1
>> sh.exe": cannot make pipe for process substitution: Function not implemented
>> sh.exe": cannot make pipe for process substitution: Function not implemented
>> sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
>
> Are these the exact strings you want to have in the commit log message? I
> am particularly wondering about the dq after (but not around) 'sh.exe'.
Yes. That's exactly what I get.
Stefan
--
----------------------------------------------------------------
python -c "print '73746566616e2e6e6165776540676d61696c2e636f6d'.decode('hex')"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-26 19:13 ` [PATCH v2] " Stefan Naewe
2011-10-26 20:02 ` Junio C Hamano
2011-10-26 21:07 ` Junio C Hamano
@ 2011-10-27 9:05 ` SZEDER Gábor
2011-10-27 10:27 ` Jonas Berlin
2 siblings, 1 reply; 10+ messages in thread
From: SZEDER Gábor @ 2011-10-27 9:05 UTC (permalink / raw)
To: Stefan Naewe; +Cc: spearce, git, gitster
On Wed, Oct 26, 2011 at 09:13:09PM +0200, Stefan Naewe wrote:
> Git for Windows comes with a bash that doesn't support process substitution.
> It issues the following error when using git-completion.bash with
> GIT_PS1_SHOWUPSTREAM set:
>
> $ export GIT_PS1_SHOWUPSTREAM=1
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": cannot make pipe for process substitution: Function not implemented
> sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
>
> Replace the process substitution with a 'here string'.
>
> Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
> ---
> contrib/completion/git-completion.bash | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 8648a36..0b3d47e 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -110,6 +110,7 @@ __git_ps1_show_upstream ()
> local upstream=git legacy="" verbose=""
>
> # get some config options from git-config
> + output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
> while read key value; do
> case "$key" in
> bash.showupstream)
> @@ -125,7 +126,7 @@ __git_ps1_show_upstream ()
> upstream=svn+git # default upstream is SVN if available, else git
> ;;
> esac
> - done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
> + done <<< "$output"
The $output variable is not declared as local and therefore it leaks
into the environment. But instead of declaring it local, why not
eliminate it altogether, and use the "$(git config ....)" command
substitution as here string?
Gábor
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-27 9:05 ` SZEDER Gábor
@ 2011-10-27 10:27 ` Jonas Berlin
2011-10-27 10:40 ` Jonas Berlin
0 siblings, 1 reply; 10+ messages in thread
From: Jonas Berlin @ 2011-10-27 10:27 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Stefan Naewe, spearce, git, gitster
On Thu, 27 Oct 2011 11:05:30 +0200
SZEDER Gábor <szeder@ira.uka.de> wrote:
> On Wed, Oct 26, 2011 at 09:13:09PM +0200, Stefan Naewe wrote:
> > Git for Windows comes with a bash that doesn't support process substitution.
> > It issues the following error when using git-completion.bash with
> > GIT_PS1_SHOWUPSTREAM set:
> >
> > $ export GIT_PS1_SHOWUPSTREAM=1
> > sh.exe": cannot make pipe for process substitution: Function not implemented
> > sh.exe": cannot make pipe for process substitution: Function not implemented
> > sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect
> >
> > Replace the process substitution with a 'here string'.
> >
> > Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
> > ---
> > contrib/completion/git-completion.bash | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> > index 8648a36..0b3d47e 100755
> > --- a/contrib/completion/git-completion.bash
> > +++ b/contrib/completion/git-completion.bash
> > @@ -110,6 +110,7 @@ __git_ps1_show_upstream ()
> > local upstream=git legacy="" verbose=""
> >
> > # get some config options from git-config
> > + output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
> > while read key value; do
> > case "$key" in
> > bash.showupstream)
> > @@ -125,7 +126,7 @@ __git_ps1_show_upstream ()
> > upstream=svn+git # default upstream is SVN if available, else git
> > ;;
> > esac
> > - done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')
> > + done <<< "$output"
>
> The $output variable is not declared as local and therefore it leaks
> into the environment. But instead of declaring it local, why not
> eliminate it altogether, and use the "$(git config ....)" command
> substitution as here string?
Wouldn't this work:
git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ' | \
while read key value; do
...
done
- xkr47
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] completion: fix issue with process substitution not working on Git for Windows
2011-10-27 10:27 ` Jonas Berlin
@ 2011-10-27 10:40 ` Jonas Berlin
0 siblings, 0 replies; 10+ messages in thread
From: Jonas Berlin @ 2011-10-27 10:40 UTC (permalink / raw)
To: Jonas Berlin; +Cc: SZEDER Gábor, Stefan Naewe, spearce, git, gitster
On Thu, 27 Oct 2011 13:27:54 +0300
Jonas Berlin <xkr47@outerspace.dyndns.org> wrote:
> On Thu, 27 Oct 2011 11:05:30 +0200
> SZEDER Gábor <szeder@ira.uka.de> wrote:
> > The $output variable is not declared as local and therefore it leaks
> > into the environment. But instead of declaring it local, why not
> > eliminate it altogether, and use the "$(git config ....)" command
> > substitution as here string?
>
> Wouldn't this work:
>
> git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ' | \
> while read key value; do
> ...
> done
Sorry, please disregard, I didn't notice it was already dismissed in v1 of the PATCH..
- xkr47
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-10-27 10:51 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-25 18:01 [PATCH] completion: fix issue with process substitution not working on Git for Windows Stefan Naewe
2011-10-25 20:39 ` Johannes Sixt
2011-10-26 6:52 ` Stefan Näwe
2011-10-26 19:13 ` [PATCH v2] " Stefan Naewe
2011-10-26 20:02 ` Junio C Hamano
2011-10-26 21:07 ` Junio C Hamano
2011-10-27 6:26 ` Stefan Näwe
2011-10-27 9:05 ` SZEDER Gábor
2011-10-27 10:27 ` Jonas Berlin
2011-10-27 10:40 ` Jonas Berlin
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).