summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-29 13:17:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-29 13:17:37 -0400
commitad3b46221463b9cb5fa3b0abaef9cbfcf3facdae (patch)
tree6d8e5b48de72050a9c8d0b89a18641f48f541726
parent158fd0d90829308d0755875c452b18f91a842709 (diff)
sheesh. seriously?
-rw-r--r--Upgrade/V2.hs1
-rw-r--r--doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn2
2 files changed, 1 insertions, 2 deletions
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 1ad41266a..67f0205c1 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -78,7 +78,6 @@ inject source dest = do
new <- liftIO (readFile $ olddir g </> source)
Annex.Branch.change dest $ \prev ->
unlines $ nub $ lines prev ++ lines new
- showProgress
logFiles :: FilePath -> Annex [FilePath]
logFiles dir = return . filter (".log" `isSuffixOf`)
diff --git a/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn b/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn
index 3d75483dc..ec8a10915 100644
--- a/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn
+++ b/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn
@@ -12,4 +12,4 @@ A whirly would be preferable, imo.
>
> I'm not particularly interested in implementing a whirley that would only
> be used in this one place, in code that very few users are going to run
-> again. I could remove the dots.. --[[Joey]]
+> again. I could remove the dots.. [[done]] --[[Joey]]