diff options
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Sync.hs | 3 | ||||
| -rw-r--r-- | Assistant/Threads/Merger.hs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index 8f30aa4f7..e6a5bc5d5 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -211,7 +211,8 @@ manualPull currentbranch remotes = do else return Nothing haddiverged <- liftAnnex Annex.Branch.forceUpdate forM_ normalremotes $ \r -> - liftAnnex $ Command.Sync.mergeRemote r currentbranch Command.Sync.mergeConfig + liftAnnex $ Command.Sync.mergeRemote r + currentbranch Command.Sync.mergeConfig def return (catMaybes failed, haddiverged) where wantpull gc = remoteAnnexPull gc diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 0bb37e664..05341db1e 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -78,6 +78,7 @@ onChange file ] void $ liftAnnex $ Command.Sync.merge currbranch Command.Sync.mergeConfig + def Git.Branch.AutomaticCommit changedbranch mergecurrent _ = noop |