diff options
| -rw-r--r-- | Git/Construct.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/Partial_direct__47__indirect_repo.mdwn | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Git/Construct.hs b/Git/Construct.hs index f9f4b464a..7500617a0 100644 --- a/Git/Construct.hs +++ b/Git/Construct.hs @@ -18,6 +18,7 @@ module Git.Construct ( fromRemoteLocation, repoAbsPath, newFrom, + checkForRepo, ) where import System.Posix.User @@ -211,6 +212,8 @@ expandTilde = expandt True | c == '/' = (n, cs) | otherwise = findname (n++[c]) cs +{- Checks if a git repository exists in a directory. Does not find + - git repositories in parent directories. -} checkForRepo :: FilePath -> IO (Maybe RepoLocation) checkForRepo dir = check isRepo $ diff --git a/debian/changelog b/debian/changelog index bb61a654b..d6e888db3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ git-annex (4.20130228) UNRELEASED; urgency=low * addurl: Add --relaxed option. * assistant: Fix ~/.ssh/git-annex-shell wrapper to work when the ssh key does not force a command. + * webapp: DTRT when told to create a git repo that already exists. -- Joey Hess <joeyh@debian.org> Wed, 27 Feb 2013 23:20:40 -0400 diff --git a/doc/bugs/Partial_direct__47__indirect_repo.mdwn b/doc/bugs/Partial_direct__47__indirect_repo.mdwn index 8c6ebf2ee..11cf7a1e8 100644 --- a/doc/bugs/Partial_direct__47__indirect_repo.mdwn +++ b/doc/bugs/Partial_direct__47__indirect_repo.mdwn @@ -20,3 +20,5 @@ Actual: * Typing `git annex indirect` on A & B shows conversion of precisely four files (three files originally checked into git and new file added to B ) back to indirect Thanks. + +> [[done]], webapp now avoids changing existing repos here. --[[Joey]] |