mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sheesh. seriously?

Browse source
This commit is contained in:
Joey Hess 2011-10-29 13:17:37 -04:00
parent 158fd0d908
commit ad3b462214
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Upgrade/V2.hs
View file

@ -78,7 +78,6 @@ inject source dest = do
new <- liftIO (readFile $ olddir g </> source) new <- liftIO (readFile $ olddir g </> source)
Annex.Branch.change dest $ \prev -> Annex.Branch.change dest $ \prev ->
unlines $ nub $ lines prev ++ lines new unlines $ nub $ lines prev ++ lines new
showProgress
logFiles :: FilePath -> Annex [FilePath] logFiles :: FilePath -> Annex [FilePath]
logFiles dir = return . filter (".log" `isSuffixOf`) logFiles dir = return . filter (".log" `isSuffixOf`)

2
doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn
View file

@ -12,4 +12,4 @@ A whirly would be preferable, imo.
> >
> I'm not particularly interested in implementing a whirley that would only > 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 > 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]]