summaryrefslogtreecommitdiff
path: root/exec_cmd.c
diff options
context:
space:
mode:
authorScott R Parish <srp@srparish.net>2007-10-27 08:36:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-30 03:51:37 (GMT)
commit384df83312d24ea4d11adcf4e73921fc192595d2 (patch)
tree38167671605fcf2a932ccab53cb775eb43d1c82a /exec_cmd.c
parentedb6ddc53e71f4f959665cbc3180bb21b7ee7634 (diff)
downloadgit-384df83312d24ea4d11adcf4e73921fc192595d2.zip
git-384df83312d24ea4d11adcf4e73921fc192595d2.tar.gz
git-384df83312d24ea4d11adcf4e73921fc192595d2.tar.bz2
"current_exec_path" is a misleading name, use "argv_exec_path"
Signed-off-by: Scott R Parish <srp@srparish.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'exec_cmd.c')
-rw-r--r--exec_cmd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/exec_cmd.c b/exec_cmd.c
index 9b74ed2..33b17a6 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -5,11 +5,11 @@
extern char **environ;
static const char *builtin_exec_path = GIT_EXEC_PATH;
-static const char *current_exec_path;
+static const char *argv_exec_path;
-void git_set_exec_path(const char *exec_path)
+void git_set_argv_exec_path(const char *exec_path)
{
- current_exec_path = exec_path;
+ argv_exec_path = exec_path;
}
@@ -18,8 +18,8 @@ const char *git_exec_path(void)
{
const char *env;
- if (current_exec_path)
- return current_exec_path;
+ if (argv_exec_path)
+ return argv_exec_path;
env = getenv(EXEC_PATH_ENVIRONMENT);
if (env && *env) {
@@ -34,7 +34,7 @@ int execv_git_cmd(const char **argv)
{
char git_command[PATH_MAX + 1];
int i;
- const char *paths[] = { current_exec_path,
+ const char *paths[] = { argv_exec_path,
getenv(EXEC_PATH_ENVIRONMENT),
builtin_exec_path };