diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:11 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:11 +0300 |
commit | 017b7c52fc00897c72f6c4808ded43c4c5f9c5b8 (patch) | |
tree | 83869f9d9a095155417a1ec616f4ce4198b689ff /contrib/credential/netrc/Makefile | |
parent | ab48bc0aeadd7f6b661bc125a913e1c7d145cd5e (diff) | |
parent | 786ef50a23cbd0e93d1e41982cfaba76801ed885 (diff) |
Merge branch 'lm/credential-netrc'
Update credential-netrc helper (in contrib/) to allow customizing
the GPG used to decrypt the encrypted .netrc file.
* lm/credential-netrc:
git-credential-netrc: accept gpg option
git-credential-netrc: adapt to test framework for git
Diffstat (limited to 'contrib/credential/netrc/Makefile')
-rw-r--r-- | contrib/credential/netrc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/credential/netrc/Makefile b/contrib/credential/netrc/Makefile index 51b76138a5..0ffa407191 100644 --- a/contrib/credential/netrc/Makefile +++ b/contrib/credential/netrc/Makefile @@ -1,5 +1,5 @@ test: - ./test.pl + ./t-git-credential-netrc.sh testverbose: - ./test.pl -d -v + ./t-git-credential-netrc.sh -d -v |