[PATCH] init-db.c: normalize env var handling.

[git.git] / init-db.c

diff --git a/init-db.c b/init-db.c
index b002dc6..7078cf7 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -5,6 +5,12 @@
  */
 #include "cache.h"
 
+/*
+ * If you want to, you can share the DB area with any number of branches.
+ * That has advantages: you can save space by sharing all the SHA1 objects.
+ * On the other hand, it might just make lookup slower and messier. You
+ * be the judge.  The default case is to have one DB per managed directory.
+ */
 int main(int argc, char **argv)
 {
        char *sha1_dir, *path;
@@ -15,25 +21,11 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       /*
-        * If you want to, you can share the DB area with any number of branches.
-        * That has advantages: you can save space by sharing all the SHA1 objects.
-        * On the other hand, it might just make lookup slower and messier. You
-        * be the judge.
-        */
        sha1_dir = getenv(DB_ENVIRONMENT);
-       if (sha1_dir) {
-               struct stat st;
-               if (!stat(sha1_dir, &st) && S_ISDIR(st.st_mode))
-                       return 0;
-               fprintf(stderr, "DB_ENVIRONMENT set to bad directory %s: ", sha1_dir);
+       if (!sha1_dir) {
+               sha1_dir = DEFAULT_DB_ENVIRONMENT;
+               fprintf(stderr, "defaulting to local storage area\n");
        }
-
-       /*
-        * The default case is to have a DB per managed directory.
-        */
-       sha1_dir = DEFAULT_DB_ENVIRONMENT;
-       fprintf(stderr, "defaulting to private storage area\n");
        len = strlen(sha1_dir);
        if (mkdir(sha1_dir, 0755) < 0) {
                if (errno != EEXIST) {