diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 21:10:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 21:10:01 -0400 |
| commit | b68a9a8a4d4380afb7e89041741d957bcec3b0c3 (patch) | |
| tree | 19c18250efe6abc67cbdc284a830eeb34ae236d1 /Command | |
| parent | 6be8289158fd30d972ac22766452e7c9dc809e6f (diff) | |
| parent | 59803f1595f16a53d789b98b8239b8e9afe7957f (diff) | |
Merge branch 'master' into relativepaths
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/View.hs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Command/View.hs b/Command/View.hs index bfe030e23..ae8fe824e 100644 --- a/Command/View.hs +++ b/Command/View.hs @@ -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 |