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/Unannex.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/Unannex.hs')
| -rw-r--r-- | Command/Unannex.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs index daa14ce85..9cb88564c 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -16,6 +16,7 @@ import qualified Annex import Annex.Content import Annex.Content.Direct import qualified Git.Command +import qualified Git.Branch import qualified Git.Ref import qualified Git.DiffTree as DiffTree import Utility.CopyFile @@ -45,9 +46,8 @@ wrapUnannex a = ifM isDirect ) ) where - commit = inRepo $ Git.Command.run - [ Param "commit" - , Param "-q" + commit = inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit + [ Param "-q" , Param "--allow-empty" , Param "--no-verify" , Param "-m", Param "content removed from git annex" |