From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: git@vger.kernel.org, "Ville Skyttä" <ville.skytta@iki.fi>
Subject: Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION
Date: Tue, 24 May 2016 12:53:01 -0700 [thread overview]
Message-ID: <xmqq7fej44iq.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqshx75psw.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 24 May 2016 10:27:59 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Others, I am not sure how seriously we would want to support those
> who use "set -u"; the damage to test-lib.sh so far (see below) does
> not look _too_ bad, but the reason why I have "set -u" after
> including lib-bash.sh is because it will trigger a lot more errors
> while lib-bash and test-lib do their preparation.
Ehh, this didn't come out very well as I hoped, primarily because my
thinking behind it was muddy X-<.
I do want to see us keep supporting those who "set -u" in their
interactive shell environment, and we should strive to make sure
that the "prompt" and the "completion", which are part of their
interactive shell experience, work well with "set -u".
It does not mean "cd t && sh t$anything.sh" must be "set -u" clean
at all (this is where my thinking was muddy); it is sufficient if we
can successfully run t9903 (prompt) with "set -u" before the script
includes "git-prompt". We do not have to be able to insert "set -u"
at the beginning of test-lib.sh and cleanly run other tests.
Having said that, some parts of "minimum" change shown in my "how
about this" patch would probably be worth doing anyway. They make
sure that:
(1) variables the test framework uses will always be initialized
properly, without getting affected a stray environment variable
the user may have. E.g. "trace".
(2) environment variables the test framework may accept to change
the behaviour, e.g. GIT_SKIP_TESTS, are clearly documented by
using the idiom "set to an empty string if not set".
So in that sense, even though we may not add "set -u" at the
beginning of test-lib.sh in the production code, doing so may be a
good developer aid to catch other variables the attached patch did
not catch and complete the above two points.
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 0055ebb..36ca13e 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -186,6 +186,9 @@ test "x$TERM" != "xdumb" && (
> ) &&
> color=t
>
> +HARNESS_ACTIVE= quiet= verbose_only= run_list= trace=
> +: ${GIT_SKIP_TESTS=}
> +
> while test "$#" -ne 0
> do
> case "$1" in
> @@ -585,7 +588,7 @@ test_eval_ () {
>
> test_run_ () {
> test_cleanup=:
> - expecting_failure=$2
> + expecting_failure=${2-}
>
> if test "${GIT_TEST_CHAIN_LINT:-1}" != 0; then
> # turn off tracing for this test-eval, as it simply creates
> @@ -750,6 +753,8 @@ test_done () {
> esac
> }
>
> +GIT_VALGRIND=
> +
> if test -n "$valgrind"
> then
> make_symlink () {
> @@ -902,6 +907,7 @@ fi
> # in subprocesses like git equals our $PWD (for pathname comparisons).
> cd -P "$TRASH_DIRECTORY" || exit 1
>
> +skip_all=
> this_test=${0##*/}
> this_test=${this_test%%-*}
> if match_pattern_list "$this_test" $GIT_SKIP_TESTS
next prev parent reply other threads:[~2016-05-24 19:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 8:31 [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION Ville Skyttä
2016-05-24 17:11 ` Junio C Hamano
2016-05-24 17:27 ` Junio C Hamano
2016-05-24 19:53 ` Junio C Hamano [this message]
2016-06-06 16:31 ` Ville Skyttä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7fej44iq.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=szeder@ira.uka.de \
--cc=ville.skytta@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).