[PATCH] Do not allow git-init-db to be called twice in the same directory

t5300 is also adapted, since it relies heavily on init-db not complaining 
when $GIT_DIR already exists.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>

---

 init-db.c              |    3 ++-
 t/t5300-pack-object.sh |   16 ++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

199557e282c6b7600fdb9f7ce8b203b1d634de8f
diff --git a/init-db.c b/init-db.c
index ff29496..1cb015e 100644
--- a/init-db.c
+++ b/init-db.c
@@ -259,7 +259,8 @@ int main(int argc, char **argv)
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 		fprintf(stderr, "defaulting to local storage area\n");
 	}
-	safe_create_dir(git_dir, 0);
+	if (mkdir(git_dir, 0777) < 0)
+		die("Cannot initialize repository twice!");
 
 	/* Check to see if the repository version is right.
 	 * Note that a newly created repository does not have
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 7dfb1ab..df6549c 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -38,13 +38,12 @@ test_expect_success \
     'packname_1=$(git-pack-objects --window=0 test-1 <obj-list)'
 
 rm -fr .git2
-mkdir .git2
 
 test_expect_success \
     'unpack without delta' \
-    "GIT_OBJECT_DIRECTORY=.git2/objects &&
+    "GIT_DIR=.git2 git-init-db &&
+     GIT_OBJECT_DIRECTORY=.git2/objects &&
      export GIT_OBJECT_DIRECTORY &&
-     git-init-db &&
      git-unpack-objects -n <test-1-${packname_1}.pack &&
      git-unpack-objects <test-1-${packname_1}.pack"
 
@@ -69,13 +68,12 @@ test_expect_success \
      packname_2=$(git-pack-objects test-2 <obj-list)'
 
 rm -fr .git2
-mkdir .git2
 
 test_expect_success \
     'unpack with delta' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
+    'GIT_DIR=.git2 git-init-db &&
+     GIT_OBJECT_DIRECTORY=.git2/objects &&
      export GIT_OBJECT_DIRECTORY &&
-     git-init-db &&
      git-unpack-objects -n <test-2-${packname_2}.pack &&
      git-unpack-objects <test-2-${packname_2}.pack'
 
@@ -94,13 +92,12 @@ test_expect_success \
 cd "$TRASH"
 
 rm -fr .git2
-mkdir .git2
 
 test_expect_success \
     'use packed objects' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
+    'GIT_DIR=.git2 git-init-db &&
+     GIT_OBJECT_DIRECTORY=.git2/objects &&
      export GIT_OBJECT_DIRECTORY &&
-     git-init-db &&
      cp test-1-${packname_1}.pack test-1-${packname_1}.idx .git2/objects/pack && {
 	 git-diff-tree --root -p $commit &&
 	 while read object
@@ -111,7 +108,6 @@ test_expect_success \
     } >current &&
     diff expect current'
 
-
 test_expect_success \
     'use packed deltified objects' \
     'GIT_OBJECT_DIRECTORY=.git2/objects &&
-- 
1.0.GIT
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html