git.c: make it clear save_env() is for alias handling only
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 3, 2015 at 19:17 UTC
0d5466d24436ac87ab69214251b004ecc809c8c1
1 file changed
+6
-6
git.c
+6
-6
@@ -25,14 +25,14 @@ static const char *env_names[] = {
25
GIT_PREFIX_ENVIRONMENT
26
};
27
static char *orig_env[4];
28
-static int saved_environment;
28
+static int saved_env_before_alias;
29
30
-static void save_env(void)
30
+static void save_env_before_alias(void)
31
{
32
int i;
33
- if (saved_environment)
33
+ if (saved_env_before_alias)
34
return;
35
- saved_environment = 1;
35
+ saved_env_before_alias = 1;
36
orig_cwd = xgetcwd();
37
for (i = 0; i < ARRAY_SIZE(env_names); i++) {
38
orig_env[i] = getenv(env_names[i]);
@@ -233,6 +233,7 @@ static int handle_alias(int *argcp, const char ***argv)
233
char *alias_string;
234
int unused_nongit;
235
236
+ save_env_before_alias();
237
subdir = setup_git_directory_gently(&unused_nongit);
238
239
alias_command = (*argv)[0];
@@ -527,7 +528,7 @@ static void handle_builtin(int argc, const char **argv)
528
529
builtin = get_builtin(cmd);
530
if (builtin) {
530
- if (saved_environment && (builtin->option & NO_SETUP))
531
+ if (saved_env_before_alias && (builtin->option & NO_SETUP))
532
restore_env();
533
else
534
exit(run_builtin(builtin, argc, argv));
@@ -587,7 +588,6 @@ static int run_argv(int *argcp, const char ***argv)
588
*/
589
if (done_alias)
590
break;
590
- save_env();
591
if (!handle_alias(argcp, argv))
592
break;
593
done_alias = 1;