Merge branch 'dk/libsecret-unlock-to-load-fix'
commit906329f369e0899d619f53071f7364270f887947
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Nov 2017 05:31:30 +0000 (9 14:31 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Nov 2017 05:31:30 +0000 (9 14:31 +0900)
tree1bd00f3e3ff156b8eca18e7e0a4eef647d0c402d
parentc90766c4f1c216f6cbcb2fb7daf6ac4cced5b1df
parent9c109e9bbcadb21cd6f955301f81583a74f8aa8c
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