refactor
Better to not have a single function module, and better to have a more specific type than Bool. This commit was sponsored by Jack Hill on Patreon
This commit is contained in:
parent
3b34d123ed
commit
0be23bae2f
11 changed files with 23 additions and 44 deletions
|
@ -17,12 +17,12 @@ module Annex.RemoteTrackingBranch
|
|||
|
||||
import Annex.Common
|
||||
import Annex.CatFile
|
||||
import qualified Annex
|
||||
import Git.Types
|
||||
import qualified Git.Ref
|
||||
import qualified Git.Branch
|
||||
import Git.History
|
||||
import qualified Types.Remote as Remote
|
||||
import Config.CommitMode
|
||||
|
||||
import qualified Data.Set as S
|
||||
|
||||
|
@ -74,7 +74,7 @@ makeRemoteTrackingBranchMergeCommit tb commitsha =
|
|||
|
||||
makeRemoteTrackingBranchMergeCommit' :: Sha -> Sha -> Sha -> Annex Sha
|
||||
makeRemoteTrackingBranchMergeCommit' commitsha importedhistory treesha = do
|
||||
cmode <- implicitCommitMode
|
||||
cmode <- annexCommitMode <$> Annex.getGitConfig
|
||||
inRepo $ Git.Branch.commitTree
|
||||
cmode
|
||||
"remote tracking branch"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue