summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-07-18 20:45:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-18 22:45:14 (GMT)
commit6ebd1cafe2bb1dee34e106a8da3ee173b36259d3 (patch)
treec2ff7f8e11494cc0f12a5c56e6b7e1e88ddfa732 /git.c
parent72470aa38ad786697118157e69174ba7ff85bfa3 (diff)
downloadgit-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 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 3fded74..f4e04a8 100644
--- a/git.c
+++ b/git.c
@@ -164,7 +164,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
if (envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--no-replace-objects")) {
- check_replace_refs = 0;
+ read_replace_refs = 0;
setenv(NO_REPLACE_OBJECTS_ENVIRONMENT, "1", 1);
if (envchanged)
*envchanged = 1;