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

cleanup

Browse source
This commit is contained in:
Joey Hess 2012-06-23 01:35:40 -04:00
parent a71e7161fc
commit d707f2dce5
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Assistant/Merger.hs
View file

@ -65,7 +65,6 @@ onAdd g file _
| otherwise = do | otherwise = do
let branch = Git.Ref $ "refs" </> "heads" </> takeFileName file let branch = Git.Ref $ "refs" </> "heads" </> takeFileName file
current <- Git.Branch.current g current <- Git.Branch.current g
print (branch, current)
when (Just branch == current) $ when (Just branch == current) $
void $ mergeBranch branch g void $ mergeBranch branch g