undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/gitignore-precedence'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2015-05-19 13:17:50 -07:00
commit 20cf8b548e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dir.c
View File

@ -1673,13 +1673,17 @@ void setup_standard_excludes(struct dir_struct *dir)
const char *path; const char *path;
dir->exclude_per_dir = ".gitignore"; dir->exclude_per_dir = ".gitignore";
path = git_path("info/exclude");
/* core.excludefile defaulting to $XDG_HOME/git/ignore */
if (!excludes_file) if (!excludes_file)
excludes_file = xdg_config_home("ignore"); 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)) if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
add_excludes_from_file(dir, excludes_file); 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) int remove_path(const char *name)

10
t/t0008-ignores.sh
View File

@ -831,4 +831,14 @@ test_expect_success !MINGW,!CYGWIN 'correct handling of backslashes' '
test_cmp err.expect err test_cmp err.expect err
' '
test_expect_success 'info/exclude trumps core.excludesfile' '
echo >>global-excludes usually-ignored &&
echo >>.git/info/exclude "!usually-ignored" &&
>usually-ignored &&
echo "?? usually-ignored" >expect &&
git status --porcelain usually-ignored >actual &&
test_cmp expect actual
'
test_done test_done