diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:02:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:02:01 -0700 |
| commit | 10d781b9caa4f71495c7b34963bef137216f86a8 (patch) | |
| tree | eec73f3aec2ea1255bb3e131bd54e0a04e64d0f2 /fsck-cache.c | |
| parent | 928f74de22536129b696218073a3940ae4ab1199 (diff) | |
| parent | fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1 (diff) | |
| download | git-10d781b9caa4f71495c7b34963bef137216f86a8.tar.gz | |
Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
Diffstat (limited to 'fsck-cache.c')
| -rw-r--r-- | fsck-cache.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fsck-cache.c b/fsck-cache.c index 8091780193..e53d01a40f 100644 --- a/fsck-cache.c +++ b/fsck-cache.c @@ -390,7 +390,10 @@ static int fsck_head_link(void) char hex[40]; unsigned char sha1[20]; static char path[PATH_MAX], link[PATH_MAX]; - const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT; + const char *git_dir; + + git_dir = gitenv(GIT_DIR_ENVIRONMENT); + if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT; snprintf(path, sizeof(path), "%s/HEAD", git_dir); if (readlink(path, link, sizeof(link)) < 0) @@ -451,7 +454,7 @@ int main(int argc, char **argv) if (standalone && check_full) die("Only one of --standalone or --full can be used."); if (standalone) - unsetenv("GIT_ALTERNATE_OBJECT_DIRECTORIES"); + putenv("GIT_ALTERNATE_OBJECT_DIRECTORIES="); fsck_head_link(); fsck_object_dir(get_object_directory()); |