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
|
@ -19,6 +19,7 @@ import qualified Git
|
|||
import qualified Git.Branch
|
||||
import qualified Git.Ref
|
||||
import qualified Command.Sync
|
||||
import Config.CommitMode
|
||||
|
||||
{- This thread watches for changes to .git/refs/, and handles incoming
|
||||
- pushes. -}
|
||||
|
@ -80,11 +81,13 @@ onChange file
|
|||
[ "merging", Git.fromRef changedbranch
|
||||
, "into", Git.fromRef b
|
||||
]
|
||||
void $ liftAnnex $ Command.Sync.merge
|
||||
currbranch Command.Sync.mergeConfig
|
||||
def
|
||||
Git.Branch.AutomaticCommit
|
||||
changedbranch
|
||||
void $ liftAnnex $ do
|
||||
cmode <- implicitCommitMode
|
||||
Command.Sync.merge
|
||||
currbranch Command.Sync.mergeConfig
|
||||
def
|
||||
cmode
|
||||
changedbranch
|
||||
mergecurrent' _ = noop
|
||||
|
||||
{- Is the first branch a synced branch or remote tracking branch related
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue