diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-20 13:56:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 13:56:14 -0800 |
| commit | aa1cef54a2bcc5350df7efe1d1745725c46bf2e3 (patch) | |
| tree | b8cbf49ff59b92c36de05d08f2dfd32c4aeb538b /config.c | |
| parent | 1d182bd5f4ec17f2f44ac0ee0d1bf6a25e98761e (diff) | |
| parent | 4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb (diff) | |
| download | git-aa1cef54a2bcc5350df7efe1d1745725c46bf2e3.tar.gz | |
Merge branch 'jc/clone'
* jc/clone:
Move "no merge candidate" warning into git-pull
Use preprocessor constants for environment variable names.
Do not create $GIT_DIR/remotes/ directory anymore.
Introduce GIT_TEMPLATE_DIR
Revert "fix testsuite: make sure they use templates freshly built from the source"
fix testsuite: make sure they use templates freshly built from the source
git-clone: lose the traditional 'no-separate-remote' layout
git-clone: lose the artificial "first" fetch refspec
git-pull: refuse default merge without branch.*.merge
git-clone: use wildcard specification for tracking branches
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -349,10 +349,10 @@ int git_config(config_fn_t fn) * $GIT_CONFIG_LOCAL will make it process it in addition to the * global config file, the same way it would the per-repository * config file otherwise. */ - filename = getenv("GIT_CONFIG"); + filename = getenv(CONFIG_ENVIRONMENT); if (!filename) { home = getenv("HOME"); - filename = getenv("GIT_CONFIG_LOCAL"); + filename = getenv(CONFIG_LOCAL_ENVIRONMENT); if (!filename) filename = repo_config = xstrdup(git_path("config")); } @@ -543,9 +543,9 @@ int git_config_set_multivar(const char* key, const char* value, char* lock_file; const char* last_dot = strrchr(key, '.'); - config_filename = getenv("GIT_CONFIG"); + config_filename = getenv(CONFIG_ENVIRONMENT); if (!config_filename) { - config_filename = getenv("GIT_CONFIG_LOCAL"); + config_filename = getenv(CONFIG_LOCAL_ENVIRONMENT); if (!config_filename) config_filename = git_path("config"); } @@ -753,9 +753,9 @@ int git_config_rename_section(const char *old_name, const char *new_name) int out_fd; char buf[1024]; - config_filename = getenv("GIT_CONFIG"); + config_filename = getenv(CONFIG_ENVIRONMENT); if (!config_filename) { - config_filename = getenv("GIT_CONFIG_LOCAL"); + config_filename = getenv(CONFIG_LOCAL_ENVIRONMENT); if (!config_filename) config_filename = git_path("config"); } |