setenv(GIT_DIR) clean-up

This patch converts the setenv() calls in path.c and setup.c. After the call, git grep with a pager works again in bare repos. It leaves the setenv(GIT_DIR_ENVIRONMENT, ...) calls in git.c alone, as they respond to command line switches that emulate the effect of setting the environment variable directly. The remaining site in environment.c is in set_git_dir() and is left alone, too, of course. Finally, builtin-init-db.c is left changed because the repo is still being carefully constructed when the environment variable is set. This fixes git shortlog when run inside a git directory, which had been broken by abe549e1. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>

René Scharfe committed Feb 6, 2010 at 10:35 UTC 717c3972dafa9d792a331b98a09d3cee88c17618

2 files changed +3 -3

path.c

+1 -1

@@ -336,7 +336,7 @@ char *enter_repo(char *path, int strict)

336

337 if (access("objects", X_OK) == 0 && access("refs", X_OK) == 0 &&

338 validate_headref("HEAD") == 0) {

339 - setenv(GIT_DIR_ENVIRONMENT, ".", 1);

339 + set_git_dir(".");

340 check_repository_format();

341 return path;

342 }

setup.c

+2 -2

@@ -404,9 +404,9 @@ const char *setup_git_directory_gently(int *nongit_ok)

404 inside_work_tree = 0;

405 if (offset != len) {

406 cwd[offset] = '\0';

407 - setenv(GIT_DIR_ENVIRONMENT, cwd, 1);

407 + set_git_dir(cwd);

408 } else

409 - setenv(GIT_DIR_ENVIRONMENT, ".", 1);

409 + set_git_dir(".");

410 check_repository_format_gently(nongit_ok);

411 return NULL;

412 }