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 /sha1_file.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 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 776697755a..fa37f1e3ef 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -283,7 +283,10 @@ void prepare_alt_odb(void) char *map; int fd; struct stat st; - char *alt = gitenv(ALTERNATE_DB_ENVIRONMENT) ? : ""; + char *alt; + + alt = gitenv(ALTERNATE_DB_ENVIRONMENT); + if (!alt) alt = ""; sprintf(path, "%s/info/alternates", get_object_directory()); if (alt_odb_tail) |