* [PATCH v2] Documentation/gitk: Document new config file location
@ 2014-03-18 17:53 Astril Hayato
2014-03-18 20:07 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Astril Hayato @ 2014-03-18 17:53 UTC (permalink / raw)
To: git; +Cc: gitster, Astril Hayato
User config file location now complies with XDG base directory specification
Signed-off-by: Astril Hayato <astrilhayato@gmail.com>
---
Documentation/gitk.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 1e9e38a..c2aa514 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -166,8 +166,13 @@ gitk --max-count=100 --all \-- Makefile::
Files
-----
-Gitk creates the .gitk file in your $HOME directory to store preferences
-such as display options, font, and colors.
+User configuration and preferences are stored at (in order of priority):
+
+* '$XDG_CONFIG_HOME/git/gitk' if it exists and '$XDG_CONFIG_HOME' is set
+* '$HOME/.config/git/gitk' if it exists
+* '$HOME/.gitk' if it exists
+
+If none of the above exist then '$HOME/.config/git/gitk' is created and used by default.
History
-------
--
1.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Documentation/gitk: Document new config file location
2014-03-18 17:53 [PATCH v2] Documentation/gitk: Document new config file location Astril Hayato
@ 2014-03-18 20:07 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2014-03-18 20:07 UTC (permalink / raw)
To: Astril Hayato; +Cc: git
Astril Hayato <astrilhayato@gmail.com> writes:
> User config file location now complies with XDG base directory specification
>
> Signed-off-by: Astril Hayato <astrilhayato@gmail.com>
> ---
> Documentation/gitk.txt | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
> index 1e9e38a..c2aa514 100644
> --- a/Documentation/gitk.txt
> +++ b/Documentation/gitk.txt
> @@ -166,8 +166,13 @@ gitk --max-count=100 --all \-- Makefile::
>
> Files
> -----
> -Gitk creates the .gitk file in your $HOME directory to store preferences
> -such as display options, font, and colors.
> +User configuration and preferences are stored at (in order of priority):
> +
> +* '$XDG_CONFIG_HOME/git/gitk' if it exists and '$XDG_CONFIG_HOME' is set
> +* '$HOME/.config/git/gitk' if it exists
> +* '$HOME/.gitk' if it exists
> +
> +If none of the above exist then '$HOME/.config/git/gitk' is created and used by default.
The last line is a bit of a lie, isn't it?
If XDG_CONFIG_HOME is set to an non-empty string, config_file is set
to $XDG_CONFIG_HOME/git/gitk. Otherwise config_file is set to
$HOME/.config/git/gitk.
After that happens:
- if that file exists, it is used;
- otherwise:
. if $HOME/.gitk exists, we use it (in other words, $HOME/.gitk
is never used unless the user is an old timer who has one);
. if $HOME/.gitk does not exist (in other words, if none of the
above exists), then an empty $config_file is created and used.
We use either $HOME/.config/git/gitk or $XDG_CONFIG_HOME/git/gitk
and never $HOME/.gitk when none of the above exists, and the choice
between the two depends on XDG_CONFIG_HOME.
I'll queue this patch as-is, but we may want to further clarify with
a follow-up patch.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-18 20:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-18 17:53 [PATCH v2] Documentation/gitk: Document new config file location Astril Hayato
2014-03-18 20:07 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.