[PATCH] Simplify "reverse-diff" logic in the diff core.

diff --git a/init-db.c b/init-db.c
index 83f95e8b926f4fd28e0db0ccfc4f040d4172ee8a..b6bb78356762bd28261949da54638f46776e6d4b 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -5,7 +5,7 @@
  */
 #include "cache.h"
 
-void safe_create_dir(char *dir)
+void safe_create_dir(const char *dir)
 {
        if (mkdir(dir, 0755) < 0) {
                if (errno != EEXIST) {
@@ -23,14 +23,16 @@ void safe_create_dir(char *dir)
  */
 int main(int argc, char **argv)
 {
-       char *sha1_dir, *path;
+       const char *sha1_dir;
+       char *path;
        int len, i;
 
-       safe_create_dir(".git");
-
-       sha1_dir = getenv(DB_ENVIRONMENT);
-       if (!sha1_dir) {
-               sha1_dir = DEFAULT_DB_ENVIRONMENT;
+       sha1_dir = get_object_directory();
+       if (!gitenv(DB_ENVIRONMENT) && !gitenv(GIT_DIR_ENVIRONMENT)) {
+               /* We create leading paths only when we fall back
+                * to local .git/objects, at least for now.
+                */
+               safe_create_dir(DEFAULT_GIT_DIR_ENVIRONMENT);
                fprintf(stderr, "defaulting to local storage area\n");
        }
        len = strlen(sha1_dir);