core.excludesfile clean-up

There are inconsistencies in the way commands currently handle
the core.excludesfile configuration variable.  The problem is
the variable is too new to be noticed by anything other than
git-add and git-status.

* git-ls-files does not notice any of the "ignore" files by
default, as it predates the standardized set of ignore files.
The calling scripts established the convention to use
.git/info/exclude, .gitignore, and later core.excludesfile.

* git-add and git-status know about it because they call
add_excludes_from_file() directly with their own notion of
which standard set of ignore files to use.  This is just a
stupid duplication of code that need to be updated every time
the definition of the standard set of ignore files is
changed.

* git-read-tree takes --exclude-per-directory=<gitignore>,
not because the flexibility was needed.  Again, this was
because the option predates the standardization of the ignore
files.

* git-merge-recursive uses hardcoded per-directory .gitignore
and nothing else.  git-clean (scripted version) does not
honor core.* because its call to underlying ls-files does not
know about it.  git-clean in C (parked in 'pu') doesn't either.

We probably could change git-ls-files to use the standard set
when no excludes are specified on the command line and ignore
processing was asked, or something like that, but that will be a
change in semantics and might break people's scripts in a subtle
way.  I am somewhat reluctant to make such a change.

On the other hand, I think it makes perfect sense to fix
git-read-tree, git-merge-recursive and git-clean to follow the
same rule as other commands.  I do not think of a valid use case
to give an exclude-per-directory that is nonstandard to
read-tree command, outside a "negative" test in the t1004 test
script.

This patch is the first step to untangle this mess.

The next step would be to teach read-tree, merge-recursive and
clean (in C) to use setup_standard_excludes().

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-add.c b/builtin-add.c
index 77dcde6936155953b5a7321dcbf7430cb5aa73a3..cf815a0b8ef0e588cfaf25f71747ba7248d19d70 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -21,7 +21,6 @@ static const char * const builtin_add_usage[] = {
 };
 
 static int take_worktree_changes;
 };
 
 static int take_worktree_changes;

-static const char *excludes_file;

 
 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
 {
 
 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
 {


@@ -61,12 +60,7 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec,
        memset(dir, 0, sizeof(*dir));
        if (!ignored_too) {
                dir->collect_ignored = 1;
        memset(dir, 0, sizeof(*dir));
        if (!ignored_too) {
                dir->collect_ignored = 1;

-               dir->exclude_per_dir = ".gitignore";
-               path = git_path("info/exclude");
-               if (!access(path, R_OK))
-                       add_excludes_from_file(dir, path);
-               if (excludes_file != NULL && !access(excludes_file, R_OK))
-                       add_excludes_from_file(dir, excludes_file);
+               setup_standard_excludes(dir);

        }
 
        /*
        }
 
        /*


@@ -141,18 +135,6 @@ static void refresh(int verbose, const char **pathspec)
         free(seen);
 }
 
         free(seen);
 }
 

-static int git_add_config(const char *var, const char *value)
-{
-       if (!strcmp(var, "core.excludesfile")) {
-               if (!value)
-                       die("core.excludesfile without value");
-               excludes_file = xstrdup(value);
-               return 0;
-       }
-
-       return git_default_config(var, value);
-}
-

 int interactive_add(void)
 {
        const char *argv[2] = { "add--interactive", NULL };
 int interactive_add(void)
 {
        const char *argv[2] = { "add--interactive", NULL };


@@ -193,7 +175,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
                exit(interactive_add());
        }
 
                exit(interactive_add());
        }
 

-       git_config(git_add_config);
+       git_config(git_default_config);

 
        newfd = hold_locked_index(&lock_file, 1);
 
 
        newfd = hold_locked_index(&lock_file, 1);
 

diff --git a/cache.h b/cache.h
index f4f27cd70d6077e69e38184f7aad27204131fefb..33ebccf48d0d8963ab5b262bfb87312e6542ed75 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -581,6 +581,7 @@ extern int pager_in_use;
 extern int pager_use_color;
 
 extern char *editor_program;
 extern int pager_use_color;
 
 extern char *editor_program;

+extern char *excludes_file;

 
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);
 
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);

diff --git a/config.c b/config.c
index dc3148d4566205858869973804de1c2ddb19e981..56e99fc0f4750174299303b27237737e09549933 100644 (file)
--- a/config.c
+++ b/config.c
@@ -431,6 +431,13 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
                return 0;
        }
 

+       if (!strcmp(var, "core.excludesfile")) {
+               if (!value)
+                       die("core.excludesfile without value");
+               excludes_file = xstrdup(value);
+               return 0;
+       }
+

        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }

diff --git a/dir.c b/dir.c
index 01790ab27d25f63ea9f0816668a822d8f059664a..fa9f9021eafef09ddeaf61f21d577b7c53fa346a 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -778,3 +778,15 @@ int remove_dir_recursively(struct strbuf *path, int only_empty)
                ret = rmdir(path->buf);
        return ret;
 }
                ret = rmdir(path->buf);
        return ret;
 }

+
+void setup_standard_excludes(struct dir_struct *dir)
+{
+       const char *path;
+
+       dir->exclude_per_dir = ".gitignore";
+       path = git_path("info/exclude");
+       if (!access(path, R_OK))
+               add_excludes_from_file(dir, path);
+       if (excludes_file && !access(excludes_file, R_OK))
+               add_excludes_from_file(dir, excludes_file);
+}

diff --git a/dir.h b/dir.h
index aaa247b2569fc5ae923f12dcd3cdede5c2dccd8d..82009dc13e4b685bc6f4f6e9206d621c7d361c65 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -71,6 +71,7 @@ extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathna
 extern char *get_relative_cwd(char *buffer, int size, const char *dir);
 extern int is_inside_dir(const char *dir);
 
 extern char *get_relative_cwd(char *buffer, int size, const char *dir);
 extern int is_inside_dir(const char *dir);
 

+extern void setup_standard_excludes(struct dir_struct *dir);

 extern int remove_dir_recursively(struct strbuf *path, int only_empty);
 
 #endif
 extern int remove_dir_recursively(struct strbuf *path, int only_empty);
 
 #endif

diff --git a/environment.c b/environment.c
index b5a6c69f7c1d214daa2556d04dd35e0976fc6e5e..1dab72ec1525ca6dd15ca20666cd91506b85890c 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -34,6 +34,7 @@ char *pager_program;
 int pager_in_use;
 int pager_use_color = 1;
 char *editor_program;
 int pager_in_use;
 int pager_use_color = 1;
 char *editor_program;

+char *excludes_file;

 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */

diff --git a/wt-status.c b/wt-status.c
index 03b5ec4488cb25bca2f9d96493e874d7c12d3636..9a6ef4a89ae659855ae0d2fa3006daf080190ed4 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -22,7 +22,6 @@ static const char use_add_rm_msg[] =
 "use \"git add/rm <file>...\" to update what will be committed";
 static const char use_add_to_include_msg[] =
 "use \"git add <file>...\" to include in what will be committed";
 "use \"git add/rm <file>...\" to update what will be committed";
 static const char use_add_to_include_msg[] =
 "use \"git add <file>...\" to include in what will be committed";

-static const char *excludes_file;

 
 static int parse_status_slot(const char *var, int offset)
 {
 
 static int parse_status_slot(const char *var, int offset)
 {


@@ -251,22 +250,16 @@ static void wt_status_print_changed(struct wt_status *s)
 static void wt_status_print_untracked(struct wt_status *s)
 {
        struct dir_struct dir;
 static void wt_status_print_untracked(struct wt_status *s)
 {
        struct dir_struct dir;

-       const char *x;

        int i;
        int shown_header = 0;
 
        memset(&dir, 0, sizeof(dir));
 
        int i;
        int shown_header = 0;
 
        memset(&dir, 0, sizeof(dir));
 

-       dir.exclude_per_dir = ".gitignore";

        if (!s->untracked) {
                dir.show_other_directories = 1;
                dir.hide_empty_directories = 1;
        }
        if (!s->untracked) {
                dir.show_other_directories = 1;
                dir.hide_empty_directories = 1;
        }

-       x = git_path("info/exclude");
-       if (file_exists(x))
-               add_excludes_from_file(&dir, x);
-       if (excludes_file && file_exists(excludes_file))
-               add_excludes_from_file(&dir, excludes_file);
+       setup_standard_excludes(&dir);

 
        read_directory(&dir, ".", "", 0, NULL);
        for(i = 0; i < dir.nr; i++) {
 
        read_directory(&dir, ".", "", 0, NULL);
        for(i = 0; i < dir.nr; i++) {


@@ -364,11 +357,5 @@ int git_status_config(const char *k, const char *v)
                int slot = parse_status_slot(k, 13);
                color_parse(v, k, wt_status_colors[slot]);
        }
                int slot = parse_status_slot(k, 13);
                color_parse(v, k, wt_status_colors[slot]);
        }

-       if (!strcmp(k, "core.excludesfile")) {
-               if (!v)
-                       die("core.excludesfile without value");
-               excludes_file = xstrdup(v);
-               return 0;
-       }

        return git_default_config(k, v);
 }
        return git_default_config(k, v);
 }