Merge branch 'master' of git@gitorious.org:git-python/mainline

apollo13 · apollo13 · commit 8df638c22c75 · 2008-08-21T16:49:42.000+02:00
diff --git a/lib/git/repo.py b/lib/git/repo.py
@@ -297,7 +297,7 @@ def init_bare(self, path, mkdir=True, **kwargs):
             os.makedirs(path, 0755)
 
         git = Git(path)
-        output = git.init(**kwargs)
+        output = git.init('--bare', **kwargs)
         return Repo(path)
     create = init_bare
 
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
@@ -120,7 +120,7 @@ def test_init_bare(self, repo, git):
         Repo.init_bare("repos/foo/bar.git")
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('init',), {}))
+        assert_equal(git.call_args, (('init', '--bare'), {}))
         assert_true(repo.called)
         assert_equal(repo.call_args, (('repos/foo/bar.git',), {}))
 
@@ -132,7 +132,7 @@ def test_init_bare_with_options(self, repo, git):
         Repo.init_bare("repos/foo/bar.git", **{'template': "/baz/sweet"})
 
         assert_true(git.called)
-        assert_equal(git.call_args, (('init',), {'template': '/baz/sweet'}))
+        assert_equal(git.call_args, (('init', '--bare'), {'template': '/baz/sweet'}))
         assert_true(repo.called)
         assert_equal(repo.call_args, (('repos/foo/bar.git',), {}))
 
