Re: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Junio C Hamano
Martin Erik Werner  writes:

> So would it make sense to do:
>   GIT_PS1_SHOWUNTRACKEDFILES="dummy" &&
>   unset GIT_PS1_SHOWUNTRACKEDFILES &&
>   (...)
> instead then?

I think we have sane_unset exactly for this reason.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Martin Erik Werner
On Wed, 2013-02-13 at 08:23 -0800, Junio C Hamano wrote:
> Martin Erik Werner  writes:
> 
> > Add 4 test for the bash.showUntrackedFiles config option, covering all
> > combinations of the shell var being set/unset and the config option
> > being enabled/disabled.
> >
> > Signed-off-by: Martin Erik Werner 
> > ---
> >  t/t9903-bash-prompt.sh |   40 
> >  1 file changed, 40 insertions(+)
> >
> > diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
> > index f17c1f8..cb008e2 100755
> > --- a/t/t9903-bash-prompt.sh
> > +++ b/t/t9903-bash-prompt.sh
> > @@ -437,6 +437,46 @@ test_expect_success 'prompt - untracked files status 
> > indicator - untracked files
> > test_cmp expected "$actual"
> >  '
> >  
> > +test_expect_success 'prompt - untracked files status indicator - shell 
> > variable unset with config disabled' '
> > +   printf " (master)" > expected &&
> > +   test_config bash.showUntrackedFiles false &&
> > +   (
> > +   unset -v GIT_PS1_SHOWUNTRACKEDFILES &&
> 
> We do not use "unset -v" anywhere else in our system.  Shells
> mimicking SysV may choke on it.  A Portable POSIX script can omit
> "-v" when unsetting a variable.
> 
> Also "unset" can return false when the variable is not set to begin
> with with some shells.
> 
> Neither of these matters for this particular case because we know we
> are running this under bash in non-posix mode.  I however wonder if
> we can do something to prevent careless coders to copy and paste
> this piece when updating other tests that are not limited to bash.
> Commenting each and every use of "unset -v" does not sound like a
> good solution and perhaps I am being unnecessarily worried too much.
> 

Yeah, my (ba)sh foo is a bit limited, I was just basing on
http://wiki.bash-hackers.org/commands/builtin/unset#portability_considerations 
which seemed to recommend using -v.

So would it make sense to do:
GIT_PS1_SHOWUNTRACKEDFILES="dummy" &&
unset GIT_PS1_SHOWUNTRACKEDFILES &&
(...)
instead then?

-- 
Martin Erik Werner 

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Junio C Hamano
Martin Erik Werner  writes:

> Add 4 test for the bash.showUntrackedFiles config option, covering all
> combinations of the shell var being set/unset and the config option
> being enabled/disabled.
>
> Signed-off-by: Martin Erik Werner 
> ---
>  t/t9903-bash-prompt.sh |   40 
>  1 file changed, 40 insertions(+)
>
> diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
> index f17c1f8..cb008e2 100755
> --- a/t/t9903-bash-prompt.sh
> +++ b/t/t9903-bash-prompt.sh
> @@ -437,6 +437,46 @@ test_expect_success 'prompt - untracked files status 
> indicator - untracked files
>   test_cmp expected "$actual"
>  '
>  
> +test_expect_success 'prompt - untracked files status indicator - shell 
> variable unset with config disabled' '
> + printf " (master)" > expected &&
> + test_config bash.showUntrackedFiles false &&
> + (
> + unset -v GIT_PS1_SHOWUNTRACKEDFILES &&

We do not use "unset -v" anywhere else in our system.  Shells
mimicking SysV may choke on it.  A Portable POSIX script can omit
"-v" when unsetting a variable.

Also "unset" can return false when the variable is not set to begin
with with some shells.

Neither of these matters for this particular case because we know we
are running this under bash in non-posix mode.  I however wonder if
we can do something to prevent careless coders to copy and paste
this piece when updating other tests that are not limited to bash.
Commenting each and every use of "unset -v" does not sound like a
good solution and perhaps I am being unnecessarily worried too much.

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html