diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-12 12:35:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-12 12:35:05 -0400 |
| commit | e4bc7e599a799d758c4d948dce65a7fa05dd50cb (patch) | |
| tree | b0e5395f57b79ce8138f09f0ae60210bb60271ba /GitRepo.hs | |
| parent | 8a3ea4edcbf1cc7059d5382ca84d0033cd9152c6 (diff) | |
revert bad change
I was wrong about git-config's level of smarts
Diffstat (limited to 'GitRepo.hs')
| -rw-r--r-- | GitRepo.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/GitRepo.hs b/GitRepo.hs index f3c959bec..565780311 100644 --- a/GitRepo.hs +++ b/GitRepo.hs @@ -136,11 +136,7 @@ gitRm repo file = runGit repo ["rm", file] gitCommandLine :: GitRepo -> [String] -> [String] gitCommandLine repo params = assertlocal repo $ -- force use of specified repo via --git-dir and --work-tree - -- gitDir cannot be used for --git-dir because the config may - -- not have been read (and gitConfigRead relies on this function). - -- So this relies on git doing the right thing when told that - -- --git-dir is the top of a work tree. - ["--git-dir="++(top repo), "--work-tree="++(top repo)] ++ params + ["--git-dir="++(gitDir repo), "--work-tree="++(top repo)] ++ params {- Runs git in the specified repo. -} runGit :: GitRepo -> [String] -> IO () |