diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:23 (GMT) |
| commit | 1689c22c1c328e9135ed51458e9f9a5d224c5057 (patch) | |
| tree | 774db619c960df03d49743e5f0bf06b34a8dcc0c /environment.c | |
| parent | a14a9bfc132f8fe80cca33d14b1acbcda945de13 (diff) | |
| parent | da4398d6a03eb2cf857aa63190e9bf60305befd2 (diff) | |
| download | git-1689c22c1c328e9135ed51458e9f9a5d224c5057.zip git-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.gz git-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.bz2 | |
Merge branch 'jk/core-use-replace-refs'
A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.
* jk/core-use-replace-refs:
add core.usereplacerefs config option
check_replace_refs: rename to read_replace_refs
check_replace_refs: fix outdated comment
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/environment.c b/environment.c index 6cf0079..b9d71a7 100644 --- a/environment.c +++ b/environment.c @@ -51,7 +51,7 @@ const char *editor_program; const char *askpass_program; const char *excludes_file; enum auto_crlf auto_crlf = AUTO_CRLF_FALSE; -int check_replace_refs = 1; /* NEEDSWORK: rename to read_replace_refs */ +int read_replace_refs = 1; char *git_replace_ref_base; enum eol core_eol = EOL_UNSET; int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN; @@ -182,7 +182,7 @@ void setup_git_env(const char *git_dir) argv_array_clear(&to_free); if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT)) - check_replace_refs = 0; + read_replace_refs = 0; replace_ref_base = getenv(GIT_REPLACE_REF_BASE_ENVIRONMENT); free(git_replace_ref_base); git_replace_ref_base = xstrdup(replace_ref_base ? replace_ref_base |