Merge pull request #4 from Oloshka/master

lzrak47m4a1 · lzrak47m4a1 · commit f848c68e76e0 · 2014-07-24T10:51:54.000+08:00
rerunning git.py init fix
diff --git a/src/repository.py b/src/repository.py
@@ -50,15 +50,16 @@ def create_repository(workspace):
             os.mkdir(workspace)
         os.chdir(workspace)
 
-        os.mkdir(GIT_DIR)
+        if not os.path.exists(GIT_DIR):
+            os.mkdir(GIT_DIR)
 
-        for new_dir in INIT_DIR:
-            os.mkdir(new_dir)
+            for new_dir in INIT_DIR:
+                os.mkdir(new_dir)
 
-        for file_and_content in INIT_FILE:
-            file_name = file_and_content[0]
-            content = file_and_content[1]
-            write_to_file(file_name, content)
+            for file_and_content in INIT_FILE:
+                file_name = file_and_content[0]
+                content = file_and_content[1]
+                write_to_file(file_name, content)
 
 
         init_config_dict = {
diff --git a/src/tests/test_init.py b/src/tests/test_init.py
@@ -35,6 +35,18 @@ def test_init_without_workspace(self):
         self._check_dirs_and_files(workspace)
         shutil.rmtree(GIT_DIR)
 
+    def test_init_in_existing_repository(self):
+        workspace = "test"
+        Command.cmd_init(workspace)
+        os.chdir('..')
+        try:
+            Command.cmd_init(workspace)
+        except OSError:
+            self.assertEqual(1, 2, "Reinitialized existing repository failed")
+        finally:
+            os.chdir('..')
+            shutil.rmtree(workspace)
+
 
 if __name__ == "__main__":
     unittest.main()
