diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
| commit | c79e3b67e9e55817992d2d0c72fd6f01a6a403ec (patch) | |
| tree | 3632838125b3e624ed2fb222f64bc0251dfee26e /Command | |
| parent | 3118eeb63fbd5ae6565c49c1e8d14f61b6f8f810 (diff) | |
sync: Avoid recent git's interactive merge.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Sync.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 5fb49d30c..1da6b0b81 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -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 |