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.
This commit is contained in:
parent
cb48baed33
commit
d41849bc23
15 changed files with 90 additions and 61 deletions
5
Test.hs
5
Test.hs
|
@ -1406,9 +1406,9 @@ clonerepo testenv old new bare = do
|
|||
ensuretmpdir
|
||||
let b = if bare then " --bare" else ""
|
||||
boolSystem "git" [Params ("clone -q" ++ b), File old, File new] @? "git clone failed"
|
||||
configrepo testenv new
|
||||
indir testenv new $
|
||||
git_annex testenv "init" ["-q", new] @? "git annex init failed"
|
||||
configrepo testenv new
|
||||
unless bare $
|
||||
indir testenv new $
|
||||
handleforcedirect testenv
|
||||
|
@ -1416,8 +1416,11 @@ clonerepo testenv old new bare = do
|
|||
|
||||
configrepo :: TestEnv -> FilePath -> IO ()
|
||||
configrepo testenv dir = indir testenv dir $ do
|
||||
-- ensure git is set up to let commits happen
|
||||
boolSystem "git" [Params "config user.name", Param "Test User"] @? "git config failed"
|
||||
boolSystem "git" [Params "config user.email test@example.com"] @? "git config failed"
|
||||
-- avoid signed commits by test suite
|
||||
boolSystem "git" [Params "config commit.gpgsign false"] @? "git config failed"
|
||||
|
||||
handleforcedirect :: TestEnv -> IO ()
|
||||
handleforcedirect testenv = when (M.lookup "FORCEDIRECT" testenv == Just "1") $
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue