diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:03:23 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:03:23 -0700 |
commit | 8c1f5f0f1f9c36ef5465512753efeff36758ba7d (patch) | |
tree | e27706307f48a9e5192f0b6bb873ecadf41dbed5 /sha1_file.c | |
parent | Merge refs/heads/master from . (diff) | |
parent | Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git (diff) | |
download | tgif-8c1f5f0f1f9c36ef5465512753efeff36758ba7d.tar.xz |
Merge refs/heads/master from .
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) |