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

Added annex.allowsign option.

Browse source 
This commit was sponsored by Ilya Shlyakhter on Patreon.
This commit is contained in:
Joey Hess 2019-11-11 16:15:05 -04:00
parent 02a8573bf2
commit 3b34d123ed
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
13 changed files with 97 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/RemoteTrackingBranch.hs
View file

@ -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