diff options
| author | Jeff King <peff@peff.net> | 2016-10-20 06:16:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 20:30:51 (GMT) |
| commit | f0056f6419deb6b4e226976c571f6429875519f1 (patch) | |
| tree | a24ea4c1759b100554fa832b1f6739dcc18405ae /dir.c | |
| parent | 2cc2e70264e0fcba04f9ef791d144bbc8b501206 (diff) | |
| download | git-f0056f6419deb6b4e226976c571f6429875519f1.zip git-f0056f6419deb6b4e226976c571f6429875519f1.tar.gz git-f0056f6419deb6b4e226976c571f6429875519f1.tar.bz2 | |
read info/{attributes,exclude} only when in repository
The low-level attribute and gitignore code will try to look
in $GIT_DIR/info for any repo-level configuration files,
even if we have not actually determined that we are in a
repository (e.g., running "git grep --no-index"). In such a
case they end up looking for ".git/info/attributes", etc.
This is generally harmless, as such a file is unlikely to
exist outside of a repository, but it's still conceptually
the wrong thing to do.
Let's detect this situation explicitly and skip reading the
file (i.e., the same behavior we'd get if we were in a
repository and the file did not exist).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2237,8 +2237,6 @@ static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude") void setup_standard_excludes(struct dir_struct *dir) { - const char *path; - dir->exclude_per_dir = ".gitignore"; /* core.excludefile defaulting to $XDG_HOME/git/ignore */ @@ -2249,10 +2247,12 @@ void setup_standard_excludes(struct dir_struct *dir) dir->untracked ? &dir->ss_excludes_file : NULL); /* per repository user preference */ - path = git_path_info_exclude(); - if (!access_or_warn(path, R_OK, 0)) - add_excludes_from_file_1(dir, path, - dir->untracked ? &dir->ss_info_exclude : NULL); + if (startup_info->have_repository) { + const char *path = git_path_info_exclude(); + if (!access_or_warn(path, R_OK, 0)) + add_excludes_from_file_1(dir, path, + dir->untracked ? &dir->ss_info_exclude : NULL); + } } int remove_path(const char *name) |