diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-04 11:36:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-04 11:53:51 -0400 |
| commit | dafe3950f721ce80d9fa8696daed626a071dab01 (patch) | |
| tree | b3bb6eb22628506b356932793daa27a021429d4b /Command/Direct.hs | |
| parent | 25e715f48fb1f4caecbcf36f5ea2ff55ecf6c3a9 (diff) | |
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.
Diffstat (limited to 'Command/Direct.hs')
| -rw-r--r-- | Command/Direct.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Command/Direct.hs b/Command/Direct.hs index 9727549b6..a5165a4a2 100644 --- a/Command/Direct.hs +++ b/Command/Direct.hs @@ -12,8 +12,8 @@ import Control.Exception.Extensible import Common.Annex import Command import qualified Git -import qualified Git.Command import qualified Git.LsFiles +import qualified Git.Branch import Config import Annex.Direct import Annex.Exception @@ -33,9 +33,8 @@ perform :: CommandPerform perform = do showStart "commit" "" showOutput - _ <- inRepo $ Git.Command.runBool - [ Param "commit" - , Param "-a" + _ <- inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit + [ Param "-a" , Param "-m" , Param "commit before switching to direct mode" ] |