From: Junio C Hamano <gitster@pobox.com>
To: "Ville Skyttä" <ville.skytta@iki.fi>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] completion: audit and guard $GIT_* against unset use
Date: Thu, 08 Apr 2021 10:45:55 -0700 [thread overview]
Message-ID: <xmqqv98wu0to.fsf@gitster.g> (raw)
In-Reply-To: <20210408070641.360431-1-ville.skytta@iki.fi> ("Ville Skyttä"'s message of "Thu, 8 Apr 2021 10:06:41 +0300")
Ville Skyttä <ville.skytta@iki.fi> writes:
> $GIT_COMPLETION_SHOW_ALL and $GIT_TESTING_ALL_COMMAND_LIST were used
> without guarding against them being unset, causing errors in nounset
> (set -u) mode.
>
> No other nounset-unsafe $GIT_* usages were found.
>
> While at it, remove a superfluous (duplicate) unset guard from $GIT_DIR
> in __git_find_repo_path.
>
> Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
> ---
> contrib/completion/git-completion.bash | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Looks good to me. Will queue. Thanks.
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index e1a66954fe..29b859a0b8 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -77,7 +77,7 @@ __git_find_repo_path ()
> test -d "$__git_dir" &&
> __git_repo_path="$__git_dir"
> elif [ -n "${GIT_DIR-}" ]; then
> - test -d "${GIT_DIR-}" &&
> + test -d "$GIT_DIR" &&
> __git_repo_path="$GIT_DIR"
> elif [ -d .git ]; then
> __git_repo_path=.git
> @@ -427,7 +427,7 @@ __gitcomp_builtin ()
>
> if [ -z "$options" ]; then
> local completion_helper
> - if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then
> + if [ "${GIT_COMPLETION_SHOW_ALL-}" = "1" ]; then
> completion_helper="--git-completion-helper-all"
> else
> completion_helper="--git-completion-helper"
> @@ -1910,7 +1910,7 @@ _git_help ()
> return
> ;;
> esac
> - if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
> + if test -n "${GIT_TESTING_ALL_COMMAND_LIST-}"
> then
> __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
> else
prev parent reply other threads:[~2021-04-08 17:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 7:06 [PATCH] completion: audit and guard $GIT_* against unset use Ville Skyttä
2021-04-08 17:45 ` Junio C Hamano [this message]
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=xmqqv98wu0to.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).