remove windows --git-dir unix style path hack
This is no longer necessary, at least with msysgit 1.8.5.2.msysgit.0. Its root cause may have been fixed by other recent git path fixes. It was causing the webapp to fail to make repos on other drives.
This commit is contained in:
parent
7b19c7d25b
commit
029a1c431a
3 changed files with 10 additions and 11 deletions
|
@ -300,7 +300,6 @@ getGenKeyForDriveR drive = withNewSecretKey $ \keyid ->
|
|||
getFinishAddDriveR :: RemovableDrive -> RepoKey -> Handler Html
|
||||
getFinishAddDriveR drive = go
|
||||
where
|
||||
{- Set up new gcrypt special remote. -}
|
||||
go (RepoKey keyid) = whenGcryptInstalled $ makewith $ const $ do
|
||||
r <- liftAnnex $ addRemote $
|
||||
makeGCryptRemote remotename dir keyid
|
||||
|
|
|
@ -25,18 +25,10 @@ gitCommandLine :: [CommandParam] -> Repo -> [CommandParam]
|
|||
gitCommandLine params r@(Repo { location = l@(Local _ _ ) }) =
|
||||
setdir : settree ++ gitGlobalOpts r ++ params
|
||||
where
|
||||
setdir = Param $ "--git-dir=" ++ gitpath (gitdir l)
|
||||
setdir = Param $ "--git-dir=" ++ gitdir l
|
||||
settree = case worktree l of
|
||||
Nothing -> []
|
||||
Just t -> [Param $ "--work-tree=" ++ gitpath t]
|
||||
#ifdef mingw32_HOST_OS
|
||||
-- despite running on windows, msysgit wants a unix-formatted path
|
||||
gitpath s
|
||||
| absoluteGitPath s = "/" ++ dropDrive (toInternalGitPath s)
|
||||
| otherwise = s
|
||||
#else
|
||||
gitpath = id
|
||||
#endif
|
||||
gitCommandLine _ repo = assertLocal repo $ error "internal"
|
||||
|
||||
{- Runs git in the specified repo. -}
|
||||
|
|
|
@ -46,7 +46,15 @@ now! --[[Joey]]
|
|||
the directory somehow.
|
||||
* gcrypt is not ported to windows (and as a shell script, may need
|
||||
to be rewritten)
|
||||
* webapp lets user choose to encrypt repo, and generate gpg key,
|
||||
before checking that gcrypt is not installed
|
||||
* glacier-cli is not easily available (probably)
|
||||
* When clicking on the Files at the top of the webapp, a file
|
||||
browser *is* opened, but it has a Z-order underneath the web browser.
|
||||
* TODO: test S3 and box.com setup in webapp now that they should work..
|
||||
|
||||
## stuff needing testing
|
||||
|
||||
* test S3 and box.com setup in webapp now that they should work..
|
||||
* test that adding a repo on a removable drive works; that git is synced to
|
||||
it and files can be transferred to it and back
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue