aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-22 16:21:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-22 16:21:37 -0400
commitfaf4629052424fbd2a505a0218390ac8f3b50100 (patch)
tree0ae1130ba6fc3379335a5e9ff1c1a199a562cb41
parentcd2e56199b674a24f2394c68592cbc07c0d27efa (diff)
webapp: When told to add a git repository on a remote server, and the repository already exists as a non-bare repository, use it, rather than initializing a bare repository in the same directory.
-rw-r--r--debian/changelog3
-rw-r--r--doc/bugs/Adding_a_repository_as_a___34__remote_server__34___creates_a_bare_repository_next_to_the_existing_one.mdwn6
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c0cba45ce..8a5053167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ git-annex (4.20130418) UNRELEASED; urgency=low
don't have user.name set in git config, and put in a workaround
so that commits to the git-annex branch (and the assistant)
will still succeed despite git not liking the system configuration.
+ * webapp: When told to add a git repository on a remote server, and
+ the repository already exists as a non-bare repository, use it,
+ rather than initializing a bare repository in the same directory.
-- Joey Hess <joeyh@debian.org> Thu, 18 Apr 2013 16:22:48 -0400
diff --git a/doc/bugs/Adding_a_repository_as_a___34__remote_server__34___creates_a_bare_repository_next_to_the_existing_one.mdwn b/doc/bugs/Adding_a_repository_as_a___34__remote_server__34___creates_a_bare_repository_next_to_the_existing_one.mdwn
index 02513175c..c2e05dee0 100644
--- a/doc/bugs/Adding_a_repository_as_a___34__remote_server__34___creates_a_bare_repository_next_to_the_existing_one.mdwn
+++ b/doc/bugs/Adding_a_repository_as_a___34__remote_server__34___creates_a_bare_repository_next_to_the_existing_one.mdwn
@@ -13,3 +13,9 @@ git-annex version: 4.20130324, Ubuntu 11.04
**Please provide any additional information below.**
[[!tag /design/assistant]]
+
+> I have made it check for the .git directory and reuse the existing
+> repository if it's there. [[done]] --[[Joey]]
+>
+> (The comment about `git-annex-shell` is incorrect; it has nothing
+> to do with this.)