Added annex.allowsign option.
This commit was sponsored by Ilya Shlyakhter on Patreon.
This commit is contained in:
parent
02a8573bf2
commit
3b34d123ed
13 changed files with 97 additions and 32 deletions
|
@ -22,6 +22,7 @@ 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
|
||||
|
||||
|
@ -72,9 +73,10 @@ makeRemoteTrackingBranchMergeCommit tb commitsha =
|
|||
_ -> return commitsha
|
||||
|
||||
makeRemoteTrackingBranchMergeCommit' :: Sha -> Sha -> Sha -> Annex Sha
|
||||
makeRemoteTrackingBranchMergeCommit' commitsha importedhistory treesha =
|
||||
makeRemoteTrackingBranchMergeCommit' commitsha importedhistory treesha = do
|
||||
cmode <- implicitCommitMode
|
||||
inRepo $ Git.Branch.commitTree
|
||||
Git.Branch.AutomaticCommit
|
||||
cmode
|
||||
"remote tracking branch"
|
||||
[commitsha, importedhistory]
|
||||
treesha
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue