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 2011-11-30 12:01:15 -04:00
parent 998d8f7968
commit 598eb2e2da
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Annex/Branch.hs
View file

@ -186,7 +186,7 @@ tryFastForwardTo :: [Git.Ref] -> Annex Bool
tryFastForwardTo [] = return True tryFastForwardTo [] = return True
tryFastForwardTo (first:rest) = do tryFastForwardTo (first:rest) = do
-- First, check that the git-annex branch does not contain any -- First, check that the git-annex branch does not contain any
-- new commits that are in the first other branch. If it does, -- new commits that are not in the first other branch. If it does,
-- cannot fast-forward. -- cannot fast-forward.
diverged <- changedBranch first fullname diverged <- changedBranch first fullname
if diverged if diverged
@ -195,7 +195,8 @@ tryFastForwardTo (first:rest) = do
where where
no_ff = return False no_ff = return False
do_ff branch = do do_ff branch = do
inRepo $ Git.run "update-ref" [Param $ show fullname, Param $ show branch] inRepo $ Git.run "update-ref"
[Param $ show fullname, Param $ show branch]
return True return True
findbest c [] = return $ Just c findbest c [] = return $ Just c
findbest c (r:rs) findbest c (r:rs)