Skip to content

Commit

Permalink
Merge branch 'dk/libsecret-unlock-to-load-fix'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Nov 9, 2017
2 parents c90766c + 9c109e9 commit 906329f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/credential/libsecret/git-credential-libsecret.c
Expand Up @@ -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);
Expand Down

0 comments on commit 906329f

Please sign in to comment.