From e87f3b40ebec2014cbc289656f6e80dadd3b9960 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Apr 2015 20:08:38 -0400 Subject: [PATCH] propigate outer output state into inner state when running onLocal Otherwise, progress displays would not be suppressed here when running with --quiet. Interesting wrinkle! --- Remote/Git.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Remote/Git.hs b/Remote/Git.hs index a7cecfc5c5..abefc113e8 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