diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:30 +0900 |
| commit | 906329f369e0899d619f53071f7364270f887947 (patch) | |
| tree | 1bd00f3e3ff156b8eca18e7e0a4eef647d0c402d | |
| parent | Merge branch 'ks/mailmap' (diff) | |
| parent | credential-libsecret: unlock locked secrets (diff) | |
| download | tgif-906329f369e0899d619f53071f7364270f887947.tar.xz | |
Merge branch 'dk/libsecret-unlock-to-load-fix'
The credential helper for libsecret (in contrib/) has been improved
to allow possibly prompting the end user to unlock secrets that are
currently locked (otherwise the secrets may not be loaded).
* dk/libsecret-unlock-to-load-fix:
credential-libsecret: unlock locked secrets
| -rw-r--r-- | contrib/credential/libsecret/git-credential-libsecret.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/credential/libsecret/git-credential-libsecret.c b/contrib/credential/libsecret/git-credential-libsecret.c index 4c56979d8a..b4750c9ee8 100644 --- a/contrib/credential/libsecret/git-credential-libsecret.c +++ b/contrib/credential/libsecret/git-credential-libsecret.c @@ -104,7 +104,7 @@ static int keyring_get(struct credential *c) items = secret_service_search_sync(service, SECRET_SCHEMA_COMPAT_NETWORK, attributes, - SECRET_SEARCH_LOAD_SECRETS, + SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_UNLOCK, NULL, &error); g_hash_table_unref(attributes); |