Re: [PATCH 1/3] Testing: XDG config files: Export a suitable `XDG_CONFIG_HOME' environment variable
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- Jul 17, 2012, 18:14 UTC
- Message-ID
- <vpqmx2yp85z.fsf@bauges.imag.fr>
- In-Reply-To
- <679ad82bd4604d1c903f3c2fff2a8cfb-mfwitten@gmail.com>
Michael Witten <mfwitten@gmail.com> writes:
Show 9 quoted lines
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -544,6 +544,9 @@ rm -fr "$test" || {
> HOME="$TRASH_DIRECTORY"
> export HOME
>
> +XDG_CONFIG_HOME=$HOME/.config
> +export XDG_CONFIG_HOME
> +Why not just unset XDG_CONFIG_HOME?
Your match makes it look like XDG_CONFIG_HOME is required to use the configuration directory, but it is not. To me, the main feature is the ability to use $HOME/.config/git/ as a configuration directory (this is not just a convention, this is a documented feature), and the management of the variable $XDG_CONFIG_HOME is just a bonnus.
Before your patches, the correct management of $XDG_CONFIG_HOME to override $HOME/.config/git/ was untested (which is unfortunate, indeed), but after your patch serie, the fact that the default is $HOME/.config/git/ is untested, which IMHO is even worse.
Unsetting XDG_CONFIG_HOME and adding one test like this would be better IMHO.
diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh index 3c75c3f..f1ea9f1 100755 --- a/t/t1306-xdg-files.sh +++ b/t/t1306-xdg-files.sh @@ -38,6 +38,19 @@ test_expect_success 'read with --get: xdg file exists and ~/.gitconfig doesn'\'' test_cmp expected actual ' +test_expect_success '"$XDG_CONFIG_HOME overrides $HOME/.config/git' ' + mkdir -p "$HOME"/xdg/git/ && + echo "[user]" >"$HOME"/xdg/git/config && + echo " name = in_xdg" >>"$HOME"/xdg/git/config && + echo in_xdg >expected && + ( + XDG_CONFIG_HOME="$HOME"/xdg/ && + export XDG_CONFIG_HOME && + git config --get-all user.name >actual + ) && + test_cmp expected actual +' + test_expect_success 'read with --get: xdg file exists and ~/.gitconfig exists' ' >.gitconfig &&
-- Matthieu Moy http://www-verimag.imag.fr/~moy/