diff options
author | Jason A. Donenfeld | 2013-05-25 19:25:56 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2013-05-25 20:33:28 +0200 |
commit | 03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe (patch) | |
tree | fb5961f5c5f99d0b3dda25632a74036f10b8dda9 /cgit.c | |
parent | 5a4156ef951162d669e7170b440fad6e4c9e306f (diff) | |
download | cgit-03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe.tar.gz cgit-03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe.tar.bz2 cgit-03eb76dfad2887127581f5f1b4e2edbe8c4ca5fe.zip |
cgit.c: Do not reset HOME after unsetting it.
The number of odd cases in which git will try to read config is far too
great to keep putting a bandaid over each one, so we'll just unset it.
If it turns out that scripts really liked to know about $HOME, we can
always reset it in the filter forks.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'cgit.c')
-rw-r--r-- | cgit.c | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -471,8 +471,6 @@ static char *guess_defbranch(void) | |||
471 | 471 | ||
472 | static int prepare_repo_cmd(struct cgit_context *ctx) | 472 | static int prepare_repo_cmd(struct cgit_context *ctx) |
473 | { | 473 | { |
474 | char *user_home; | ||
475 | char *xdg_home; | ||
476 | unsigned char sha1[20]; | 474 | unsigned char sha1[20]; |
477 | int nongit = 0; | 475 | int nongit = 0; |
478 | int rc; | 476 | int rc; |
@@ -483,11 +481,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
483 | /* Do not look in /etc/ for gitconfig and gitattributes. */ | 481 | /* Do not look in /etc/ for gitconfig and gitattributes. */ |
484 | setenv("GIT_CONFIG_NOSYSTEM", "1", 1); | 482 | setenv("GIT_CONFIG_NOSYSTEM", "1", 1); |
485 | setenv("GIT_ATTR_NOSYSTEM", "1", 1); | 483 | setenv("GIT_ATTR_NOSYSTEM", "1", 1); |
486 | |||
487 | /* We unset HOME and XDG_CONFIG_HOME before calling the git setup function | ||
488 | * so that we don't make unneccessary filesystem accesses. */ | ||
489 | user_home = getenv("HOME"); | ||
490 | xdg_home = getenv("XDG_CONFIG_HOME"); | ||
491 | unsetenv("HOME"); | 484 | unsetenv("HOME"); |
492 | unsetenv("XDG_CONFIG_HOME"); | 485 | unsetenv("XDG_CONFIG_HOME"); |
493 | 486 | ||
@@ -497,12 +490,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
497 | setup_git_directory_gently(&nongit); | 490 | setup_git_directory_gently(&nongit); |
498 | init_display_notes(NULL); | 491 | init_display_notes(NULL); |
499 | 492 | ||
500 | /* We restore the unset variables afterward. */ | ||
501 | if (user_home) | ||
502 | setenv("HOME", user_home, 1); | ||
503 | if (xdg_home) | ||
504 | setenv("XDG_CONFIG_HOME", xdg_home, 1); | ||
505 | |||
506 | if (nongit) { | 493 | if (nongit) { |
507 | const char *name = ctx->repo->name; | 494 | const char *name = ctx->repo->name; |
508 | rc = errno; | 495 | rc = errno; |