diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:05:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:05:02 +0900 |
| commit | 30322f1727699009b3f88bfd4b12b550a1bb8fdb (patch) | |
| tree | 61ac9c3b48d68d26b06d4f42de39e917598b61f9 | |
| parent | 16f8cd1fba98fc39ac32c7063e38f9c8470f643a (diff) | |
| parent | 9c109e9bbcadb21cd6f955301f81583a74f8aa8c (diff) | |
| download | git-30322f1727699009b3f88bfd4b12b550a1bb8fdb.tar.gz | |
Merge branch 'dk/libsecret-unlock-to-load-fix' into maint
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); |