[PATCHv5 3/4] Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
From: Huynh Khoi Nguyen NGUYEN <hidden>
Date: 2016-06-15 22:53:58
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: NGUYEN Huynh Khoi Nguyen <redacted> If core.attributesfile is not defined, its default value will be $XDG_CONFIG_HOME/git/attributes in order to follow XDG specification. If $XDG_CONFIG_HOME is either not set or emty, $HOME/.config will be used. Signed-off-by: Huynh Khoi Nguyen NGUYEN <redacted> Signed-off-by: Valentin DUPERRAY <redacted> Signed-off-by: Franck JONAS <redacted> Signed-off-by: Thomas NGUY <redacted> Signed-off-by: Lucien KONG <redacted> Signed-off-by: Matthieu Moy <redacted> --- Documentation/config.txt | 4 +++- Documentation/gitattributes.txt | 2 ++ attr.c | 17 ++++++++++------- t/t1306-xdg-files.sh | 30 ++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bfaef2c..9dc274c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -500,7 +500,9 @@ core.attributesfile:: In addition to '.gitattributes' (per-directory) and '.git/info/attributes', git looks into this file for attributes (see linkgit:gitattributes[5]). Path expansions are made the same - way as for `core.excludesfile`. + way as for `core.excludesfile`. Its default value is + $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not + set or empty, $HOME/.config will be used. core.editor:: Commands such as `commit` and `tag` that lets you edit
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 80120ea..3339eef 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt@@ -75,6 +75,8 @@ repositories (i.e., attributes of interest to all users) should go into `.gitattributes` files. Attributes that should affect all repositories for a single user should be placed in a file specified by the `core.attributesfile` configuration option (see linkgit:git-config[1]). +Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME +is either not set or empty, $HOME/.config will be used. Attributes for all users on a system should be placed in the `$(prefix)/etc/gitattributes` file.
diff --git a/attr.c b/attr.c
index 303751f..aef93d8 100644
--- a/attr.c
+++ b/attr.c@@ -497,6 +497,7 @@ static int git_attr_system(void) static void bootstrap_attr_stack(void) { struct attr_stack *elem; + char *xdg_attributes_file; if (attr_stack) return;
@@ -515,13 +516,15 @@ static void bootstrap_attr_stack(void) } } - if (git_attributes_file) { - elem = read_attr_from_file(git_attributes_file, 1); - if (elem) { - elem->origin = NULL; - elem->prev = attr_stack; - attr_stack = elem; - } + if (!git_attributes_file) { + home_config_paths(NULL, &xdg_attributes_file, "attributes"); + git_attributes_file = xdg_attributes_file; + } + elem = read_attr_from_file(git_attributes_file, 1); + if (elem) { + elem->origin = NULL; + elem->prev = attr_stack; + attr_stack = elem; } if (!is_bare_repository() || direction == GIT_ATTR_INDEX) {
diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh
index 1a1f07e..80621ed 100755
--- a/t/t1306-xdg-files.sh
+++ b/t/t1306-xdg-files.sh@@ -84,4 +84,34 @@ test_expect_success 'Exclusion in a non-XDG global ignore file' ' test_must_fail git add to_be_excluded ' +test_expect_success 'Checking attributes in the XDG attributes file' ' + git init git && + cd git && + echo foo >f && + git check-attr -a f >actual && + test_line_count -eq 0 actual && + mkdir -p "$HOME"/.config/git/ && + echo "f attr_f" >"$HOME"/.config/git/attributes && + echo "f: attr_f: set" >expected && + git check-attr -a f >actual && + test_cmp expected actual +' + +test_expect_success 'Checking attributes in both XDG and local ignore files' ' + echo "f -attr_f" >.gitattributes && + echo "f: attr_f: unset" >expected && + git check-attr -a f >actual && + test_cmp expected actual +' + +test_expect_success 'Checking attributes in a non-XDG global attributes file' ' + rm .gitattributes && + echo "f attr_f=test" >"$HOME"/my_gitattributes && + git config core.attributesfile "$HOME"/my_gitattributes && + test_when_finished "cd \"$HOME\" && rm -rf git && rm -r .config" && + echo "f: attr_f: test" >expected && + git check-attr -a f >actual && + test_cmp expected actual +' + test_done
--
1.7.8