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

sync: Avoid recent git's interactive merge.

Browse source
This commit is contained in:
Joey Hess 2012-06-23 10:22:56 -04:00
parent 3118eeb63f
commit c79e3b67e9
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Sync.hs
View file

@ -16,6 +16,7 @@ import qualified Remote
import qualified Annex
import qualified Annex.Branch
import qualified Git.Command
import qualified Git.Merge
import qualified Git.Branch
import qualified Git.Ref
import qualified Git
@ -157,7 +158,7 @@ mergeAnnex = do
mergeFrom :: Git.Ref -> CommandCleanup
mergeFrom branch = do
showOutput
inRepo $ Git.Command.runBool "merge" [Param $ show branch]
inRepo $ Git.Merge.mergeNonInteractive branch
changed :: Remote -> Git.Ref -> Annex Bool
changed remote b = do