Skip to content

Prefer $XDG_CONFIG_HOME/ag/ignore over ~/.agignore #1450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prefer $XDG_CONFIG_HOME/ag/ignore over ~/.agignore #1450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f4c779
Prefer $XDG_CONFIG_HOME/ag/ignore over ~/.agignore
aarongable Jun 16, 2021
1103661
Rename config_home to config_dir
aarongable Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ void parse_options(int argc, char **argv, char **base_paths[], char **paths[]) {
int opt_index = 0;
char *num_end;
const char *home_dir = getenv("HOME");
const char *config_dir = getenv("XDG_CONFIG_HOME");
char *ignore_file_path = NULL;
int accepts_query = 1;
int needs_query = 1;
Expand Down Expand Up @@ -685,10 +686,15 @@ void parse_options(int argc, char **argv, char **base_paths[], char **paths[]) {
exit(1);
}

if (home_dir && !opts.search_all_files) {
log_debug("Found user's home dir: %s", home_dir);
ag_asprintf(&ignore_file_path, "%s/.agignore", home_dir);
load_ignore_patterns(root_ignores, ignore_file_path);
if (!opts.search_all_files) {
if (config_dir) {
ag_asprintf(&ignore_file_path, "%s/%s", config_dir, "ag/ignore");
} else if (home_dir) {
ag_asprintf(&ignore_file_path, "%s/%s", home_dir, ".agignore");
}
if (ignore_file_path) {
load_ignore_patterns(root_ignores, ignore_file_path);
}
free(ignore_file_path);
}

Expand All @@ -710,9 +716,8 @@ void parse_options(int argc, char **argv, char **base_paths[], char **paths[]) {
gitconfig_res[buf_len] = '\0';
if (buf_len == 0) {
free(gitconfig_res);
const char *config_home = getenv("XDG_CONFIG_HOME");
if (config_home) {
ag_asprintf(&gitconfig_res, "%s/%s", config_home, "git/ignore");
if (config_dir) {
ag_asprintf(&gitconfig_res, "%s/%s", config_dir, "git/ignore");
} else if (home_dir) {
ag_asprintf(&gitconfig_res, "%s/%s", home_dir, ".config/git/ignore");
} else {
Expand Down