reflog: fix expire --single-worktree

[thirdparty/git.git] / attr.c

diff --git a/attr.c b/attr.c
index d45d34058df639c9a6c3fc80f51fa864611e5b21..ff0a3e7b61ad0468de7d42305ffc723fbfb9c9e1 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -6,18 +6,19 @@
  * an insanely large number of attributes.
  */
 
-#include "cache.h"
-#include "alloc.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "environment.h"
 #include "exec-cmd.h"
 #include "attr.h"
 #include "dir.h"
 #include "gettext.h"
+#include "path.h"
 #include "utf8.h"
 #include "quote.h"
+#include "read-cache-ll.h"
 #include "revision.h"
-#include "object-store.h"
+#include "object-store-ll.h"
 #include "setup.h"
 #include "thread-utils.h"
 #include "tree-walk.h"
@@ -870,7 +871,7 @@ static struct attr_stack *read_attr(struct index_state *istate,
        return res;
 }
 
-static const char *git_etc_gitattributes(void)
+const char *git_attr_system_file(void)
 {
        static const char *system_wide;
        if (!system_wide)
@@ -878,7 +879,7 @@ static const char *git_etc_gitattributes(void)
        return system_wide;
 }
 
-static const char *get_home_gitattributes(void)
+const char *git_attr_global_file(void)
 {
        if (!git_attributes_file)
                git_attributes_file = xdg_config_home("attributes");
@@ -886,7 +887,7 @@ static const char *get_home_gitattributes(void)
        return git_attributes_file;
 }
 
-static int git_attr_system(void)
+int git_attr_system_is_enabled(void)
 {
        return !git_env_bool("GIT_ATTR_NOSYSTEM", 0);
 }
@@ -920,14 +921,14 @@ static void bootstrap_attr_stack(struct index_state *istate,
        push_stack(stack, e, NULL, 0);
 
        /* system-wide frame */
-       if (git_attr_system()) {
-               e = read_attr_from_file(git_etc_gitattributes(), flags);
+       if (git_attr_system_is_enabled()) {
+               e = read_attr_from_file(git_attr_system_file(), flags);
                push_stack(stack, e, NULL, 0);
        }
 
        /* home directory */
-       if (get_home_gitattributes()) {
-               e = read_attr_from_file(get_home_gitattributes(), flags);
+       if (git_attr_global_file()) {
+               e = read_attr_from_file(git_attr_global_file(), flags);
                push_stack(stack, e, NULL, 0);
        }