Obey git config user.signingkey
This commit is contained in:
parent
745b893ebd
commit
e26f617761
2 changed files with 16 additions and 3 deletions
|
@ -52,14 +52,16 @@ Configuration
|
||||||
gpg --export KEYID1 > <path-to-keyring>
|
gpg --export KEYID1 > <path-to-keyring>
|
||||||
git config gcrypt.keyring <path-to-keyring>
|
git config gcrypt.keyring <path-to-keyring>
|
||||||
|
|
||||||
.. NOTE:: The user's gnupg configuration for encryption algorithms are used.
|
.. NOTE:: GnuPG's configuration applies. Check your key and general
|
||||||
Check your keys and preferences, see `man gpg`.
|
preferences, see `man gpg`.
|
||||||
|
|
||||||
+ All readers of the repository must have their pubkey included in
|
+ All readers of the repository must have their pubkey included in
|
||||||
the keyring used when pushing. All writers must have the complete
|
the keyring used when pushing. All writers must have the complete
|
||||||
set of pubkeys available. You can commit the keyring to the repo,
|
set of pubkeys available. You can commit the keyring to the repo,
|
||||||
further key management features do not yet exist.
|
further key management features do not yet exist.
|
||||||
|
|
||||||
|
+ gcrypt obeys `user.signingkey`
|
||||||
|
|
||||||
|
|
||||||
Repository Format
|
Repository Format
|
||||||
-----------------
|
-----------------
|
||||||
|
|
|
@ -184,6 +184,16 @@ CLEAN_FINAL()
|
||||||
isurl gitception "$1" && git update-ref -d "$Gref" || :
|
isurl gitception "$1" && git update-ref -d "$Gref" || :
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addsignkeyparam()
|
||||||
|
{
|
||||||
|
if isnull "$Conf_signkey"; then
|
||||||
|
"$@"
|
||||||
|
else
|
||||||
|
"$@" -u "$Conf_signkey"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
ENCRYPT()
|
ENCRYPT()
|
||||||
{
|
{
|
||||||
gpg --batch --force-mdc --compress-algo none --passphrase-fd 3 -c 3<<EOF
|
gpg --batch --force-mdc --compress-algo none --passphrase-fd 3 -c 3<<EOF
|
||||||
|
@ -202,7 +212,7 @@ EOF
|
||||||
# Encrypt to recipients $1
|
# Encrypt to recipients $1
|
||||||
PRIVENCRYPT()
|
PRIVENCRYPT()
|
||||||
{
|
{
|
||||||
gpg --no-default-keyring --keyring "$Conf_keyring" \
|
addsignkeyparam gpg --no-default-keyring --keyring "$Conf_keyring" \
|
||||||
--compress-algo none -se $1
|
--compress-algo none -se $1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -282,6 +292,7 @@ make_new_repo()
|
||||||
read_config()
|
read_config()
|
||||||
{
|
{
|
||||||
Conf_keyring=$(git config --path gcrypt.keyring || xecho "/dev/null")
|
Conf_keyring=$(git config --path gcrypt.keyring || xecho "/dev/null")
|
||||||
|
Conf_signkey=$(git config --path user.signingkey || :)
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure_connected()
|
ensure_connected()
|
||||||
|
|
Loading…
Reference in a new issue