summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-05 22:51:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-05 22:51:37 (GMT)
commit5d2bf34c22df7857c45e49d020bf1b0f4bb0db86 (patch)
tree26ef4d4a01f7fef52d39da07dd21f9b2e72af649
parentef7b9ad032be2f0f06186083f3319c18bc002921 (diff)
parentf2fc531585215d02a75a4d1ce7e6964e9eb21812 (diff)
downloadgit-5d2bf34c22df7857c45e49d020bf1b0f4bb0db86.zip
git-5d2bf34c22df7857c45e49d020bf1b0f4bb0db86.tar.gz
git-5d2bf34c22df7857c45e49d020bf1b0f4bb0db86.tar.bz2
Merge branch 'ld/osx-keychain-usage-fix' into maint
Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com> * ld/osx-keychain-usage-fix: osx-keychain: fix compiler warning
-rw-r--r--contrib/credential/osxkeychain/git-credential-osxkeychain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
index 0b44a9b..bf77748 100644
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -168,7 +168,7 @@ int main(int argc, const char **argv)
"usage: git credential-osxkeychain <get|store|erase>";
if (!argv[1])
- die(usage);
+ die("%s", usage);
read_credential();