diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-06 20:40:11 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 20:40:11 (GMT) |
commit | d8d33378ed06f1dfb5118a9b961d179e55420b44 (patch) | |
tree | f8c2ee1129c12518caf8aa2b75c0ba0ba3b04d62 /environment.c | |
parent | ed45be76345454ab74454382953cb2de868c8cdb (diff) | |
parent | c21919f1b25cf7008018e8724e92dc771057c268 (diff) | |
download | git-d8d33378ed06f1dfb5118a9b961d179e55420b44.zip git-d8d33378ed06f1dfb5118a9b961d179e55420b44.tar.gz git-d8d33378ed06f1dfb5118a9b961d179e55420b44.tar.bz2 |
Merge branch 'ab/repo-settings-cleanup'
Code cleanup.
* ab/repo-settings-cleanup:
repository.h: don't use a mix of int and bitfields
repo-settings.c: simplify the setup
read-cache & fetch-negotiator: check "enum" values in switch()
environment.c: remove test-specific "ignore_untracked..." variable
wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
Diffstat (limited to 'environment.c')
-rw-r--r-- | environment.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/environment.c b/environment.c index b4ba4fa..43bb1b3 100644 --- a/environment.c +++ b/environment.c @@ -95,13 +95,6 @@ int auto_comment_line_char; /* Parallel index stat data preload? */ int core_preload_index = 1; -/* - * This is a hack for test programs like test-dump-untracked-cache to - * ensure that they do not modify the untracked cache when reading it. - * Do not use it otherwise! - */ -int ignore_untracked_cache_config; - /* This is set by setup_git_dir_gently() and/or git_default_config() */ char *git_work_tree_cfg; @@ -329,8 +322,7 @@ char *get_graft_file(struct repository *r) static void set_git_dir_1(const char *path) { - if (setenv(GIT_DIR_ENVIRONMENT, path, 1)) - die(_("could not set GIT_DIR to '%s'"), path); + xsetenv(GIT_DIR_ENVIRONMENT, path, 1); setup_git_env(path); } |