diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-18 16:38:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-18 17:03:12 -0400 |
| commit | bb4f31a0ee496ffb83d31cc56f8827e47605d763 (patch) | |
| tree | a5d57df432ebfe942570872f9a2fe1e4897cd7a3 /Upgrade | |
| parent | a2be4265bf8207c785c7e996e2cc563ac91eb82e (diff) | |
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 4 | ||||
| -rw-r--r-- | Upgrade/V2.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index ddf0728b6..280742f06 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -82,7 +82,7 @@ moveContent = do updateSymlinks :: Annex () updateSymlinks = do showAction "updating symlinks" - top <- fromRepo Git.workTree + top <- fromRepo Git.repoPath files <- inRepo $ LsFiles.inRepo [top] forM_ files fixlink where @@ -236,4 +236,4 @@ stateDir :: FilePath stateDir = addTrailingPathSeparator ".git-annex" gitStateDir :: Git.Repo -> FilePath -gitStateDir repo = addTrailingPathSeparator $ Git.workTree repo </> stateDir +gitStateDir repo = addTrailingPathSeparator $ Git.repoPath repo </> stateDir diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index c57b0bf68..202ba5b16 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -134,4 +134,4 @@ gitAttributesUnWrite repo = do stateDir :: FilePath stateDir = addTrailingPathSeparator ".git-annex" gitStateDir :: Git.Repo -> FilePath -gitStateDir repo = addTrailingPathSeparator $ Git.workTree repo </> stateDir +gitStateDir repo = addTrailingPathSeparator $ Git.repoPath repo </> stateDir |