diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 22:17:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 22:17:51 +0200 |
| commit | 20cf8b548ebd7d5ec98729b4bb8ae5af435a22ff (patch) | |
| tree | 5744fa6cf8ffa26600bd154c9f0023bcd364bc10 /dir.c | |
| parent | Merge branch 'nd/diff-i-t-a' (diff) | |
| parent | ignore: info/exclude should trump core.excludesfile (diff) | |
| download | git-20cf8b548ebd7d5ec98729b4bb8ae5af435a22ff.tar.xz git-20cf8b548ebd7d5ec98729b4bb8ae5af435a22ff.zip | |
Merge branch 'jc/gitignore-precedence'
core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed
to be overridden by repository-specific .git/info/exclude file, but
the order was swapped from the beginning. This belatedly fixes it.
* jc/gitignore-precedence:
ignore: info/exclude should trump core.excludesfile
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1673,13 +1673,17 @@ void setup_standard_excludes(struct dir_struct *dir) const char *path; dir->exclude_per_dir = ".gitignore"; - path = git_path("info/exclude"); + + /* core.excludefile defaulting to $XDG_HOME/git/ignore */ if (!excludes_file) excludes_file = xdg_config_home("ignore"); - if (!access_or_warn(path, R_OK, 0)) - add_excludes_from_file(dir, path); if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) add_excludes_from_file(dir, excludes_file); + + /* per repository user preference */ + path = git_path("info/exclude"); + if (!access_or_warn(path, R_OK, 0)) + add_excludes_from_file(dir, path); } int remove_path(const char *name) |