From dafe3950f721ce80d9fa8696daed626a071dab01 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Jul 2014 11:36:59 -0400 Subject: support commit.gpgsign Support users who have set commit.gpgsign, by disabling gpg signatures for git-annex branch commits and commits made by the assistant. The thinking here is that a user sets commit.gpgsign intending the commits that they manually initiate to be gpg signed. But not commits made in the background, whether by a deamon or implicitly to the git-annex branch. gpg signing those would be at best a waste of CPU and at worst would fail, or flood the user with gpg passphrase prompts, or put their signature on changes they did not directly do. See Debian bug #753720. Also makes all commits done by git-annex go through a few central control points, to make such changes easier in future. Also disables commit.gpgsign in the test suite. This commit was sponsored by Antoine Boegli. --- Assistant/Threads/Committer.hs | 2 +- Assistant/Threads/Merger.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant/Threads') diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 2b60e42f3..afe4aa144 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -221,7 +221,7 @@ commitStaged = do case v of Left _ -> return False Right _ -> do - ok <- Command.Sync.commitStaged "" + ok <- Command.Sync.commitStaged Git.Branch.AutomaticCommit "" when ok $ Command.Sync.updateSyncBranch =<< inRepo Git.Branch.current return ok diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 03bcf0aad..8d660da06 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -83,7 +83,7 @@ onChange file [ "merging", Git.fromRef changedbranch , "into", Git.fromRef current ] - void $ liftAnnex $ autoMergeFrom changedbranch (Just current) + void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit mergecurrent _ = noop handleDesynced = case fromTaggedBranch changedbranch of -- cgit v1.2.3