diff options
| author | Jeff King <peff@peff.net> | 2018-07-18 20:45:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 22:45:14 (GMT) |
| commit | 6ebd1cafe2bb1dee34e106a8da3ee173b36259d3 (patch) | |
| tree | c2ff7f8e11494cc0f12a5c56e6b7e1e88ddfa732 /environment.c | |
| parent | 72470aa38ad786697118157e69174ba7ff85bfa3 (diff) | |
| download | git-6ebd1cafe2bb1dee34e106a8da3ee173b36259d3.zip git-6ebd1cafe2bb1dee34e106a8da3ee173b36259d3.tar.gz git-6ebd1cafe2bb1dee34e106a8da3ee173b36259d3.tar.bz2 | |
check_replace_refs: rename to read_replace_refs
This was added as a NEEDSWORK in c3c36d7de2 (replace-object:
check_replace_refs is safe in multi repo environment, 2018-04-11),
waiting for a calmer period. Since doing so now doesn't conflict
with anything in 'pu', it seems as good a time as any.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 013e845..3042e5f 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; @@ -183,7 +183,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 |