Add support for key::...
public key format
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
4f582f77cc
commit
651684ef56
2 changed files with 2 additions and 2 deletions
|
@ -11,7 +11,7 @@ git committerconfig
|
||||||
### Commit
|
### Commit
|
||||||
|
|
||||||
signingkey=$(git config user.signingkey)
|
signingkey=$(git config user.signingkey)
|
||||||
if [[ $signingkey =~ ^(ssh|ecdsa) ]]; then
|
if [[ $signingkey =~ ^(ssh|ecdsa|key::) ]]; then
|
||||||
step "Loading ssh key into agent..."
|
step "Loading ssh key into agent..."
|
||||||
vault-sshadd $(cut -d ' ' -f 3 <<<"${signingkey}")
|
vault-sshadd $(cut -d ' ' -f 3 <<<"${signingkey}")
|
||||||
else
|
else
|
||||||
|
|
|
@ -42,7 +42,7 @@ def main():
|
||||||
if 'signingkey' in combi and combi['signingkey'] != '':
|
if 'signingkey' in combi and combi['signingkey'] != '':
|
||||||
set_local_config('user.signingkey', combi['signingkey'])
|
set_local_config('user.signingkey', combi['signingkey'])
|
||||||
set_local_config('gpg.format', 'ssh' if re.search(
|
set_local_config('gpg.format', 'ssh' if re.search(
|
||||||
r'^(?:ssh|ecdsa)', combi['signingkey']) else 'openpgp')
|
r'^(?:ssh|ecdsa|key::)', combi['signingkey']) else 'openpgp')
|
||||||
|
|
||||||
if 'commit-opts' in combi:
|
if 'commit-opts' in combi:
|
||||||
set_local_config('commit.cliopts', combi['commit-opts'])
|
set_local_config('commit.cliopts', combi['commit-opts'])
|
||||||
|
|
Loading…
Reference in a new issue