summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-28 23:03:23 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-28 23:03:23 -0700
commit8c1f5f0f1f9c36ef5465512753efeff36758ba7d (patch)
treee27706307f48a9e5192f0b6bb873ecadf41dbed5 /sha1_file.c
parentMerge refs/heads/master from . (diff)
parentMerge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git (diff)
downloadtgif-8c1f5f0f1f9c36ef5465512753efeff36758ba7d.tar.xz
Merge refs/heads/master from .
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c5
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)