fix view generation code to work when run in a subdirectory; no longer needs to setCurrentDirectory to top of repo
This commit is contained in:
parent
9d75709bf7
commit
d7f1449b2b
2 changed files with 9 additions and 9 deletions
|
@ -53,10 +53,8 @@ mkView params = go =<< inRepo Git.Branch.current
|
|||
|
||||
checkoutViewBranch :: View -> (View -> Annex Git.Branch) -> CommandCleanup
|
||||
checkoutViewBranch view mkbranch = do
|
||||
oldcwd <- liftIO getCurrentDirectory
|
||||
here <- liftIO getCurrentDirectory
|
||||
|
||||
{- Change to top of repository before creating view branch. -}
|
||||
liftIO . setCurrentDirectory =<< fromRepo Git.repoPath
|
||||
branch <- mkbranch view
|
||||
|
||||
showOutput
|
||||
|
@ -68,9 +66,9 @@ checkoutViewBranch view mkbranch = do
|
|||
setView view
|
||||
{- A git repo can easily have empty directories in it,
|
||||
- and this pollutes the view, so remove them. -}
|
||||
liftIO $ removeemptydirs "."
|
||||
unlessM (liftIO $ doesDirectoryExist oldcwd) $ do
|
||||
top <- fromRepo Git.repoPath
|
||||
top <- fromRepo Git.repoPath
|
||||
liftIO $ removeemptydirs top
|
||||
unlessM (liftIO $ doesDirectoryExist here) $ do
|
||||
showLongNote (cwdmissing top)
|
||||
return ok
|
||||
where
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue