summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 20:08:38 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 20:08:38 -0400
commit7cf20a83bdaf1a3244df74346e9ff026e4ef53b3 (patch)
tree483e54875d870bc25467b89e81bb0bb593e31d2a
parent0caa99abe56bc5b4e3754af697bc520b18df53c6 (diff)
propigate outer output state into inner state when running onLocal
Otherwise, progress displays would not be suppressed here when running with --quiet. Interesting wrinkle!
-rw-r--r--Remote/Git.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index a7cecfc5c..abefc113e 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -542,7 +542,8 @@ onLocal r a = do
cache st = Annex.changeState $ \s -> s
{ Annex.remoteannexstate = M.insert (uuid r) st (Annex.remoteannexstate s) }
go st a' = do
- (ret, st') <- liftIO $ Annex.run st $
+ curro <- Annex.getState Annex.output
+ (ret, st') <- liftIO $ Annex.run (st { Annex.output = curro }) $
catFileStop `after` a'
cache st'
return ret