From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:05:02 +0000 (+0900)
Subject: Merge branch 'dk/libsecret-unlock-to-load-fix' into maint
X-Git-Tag: v2.15.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30322f1727699009b3f88bfd4b12b550a1bb8fdb;p=thirdparty%2Fgit.git

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
---

30322f1727699009b3f88bfd4b12b550a1bb8fdb