Merge branch 'jk/test-shell-trace'

diff --git a/credential-store.c b/credential-store.c
index 26f7589a60b882251b1e601433a6d8be4ddfe794..d435514cbe29aa01d9cebadb947a6c6c8a1e2527 100644 (file)
--- a/credential-store.c
+++ b/credential-store.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "lockfile.h"
 #include "credential.h"
 #include "string-list.h"
 #include "parse-options.h"
@@ -114,7 +115,7 @@ static int lookup_credential(const char *fn, struct credential *c)
        return c->username && c->password;
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        const char * const usage[] = {
                "git credential-store [options] <action>",
@@ -131,7 +132,7 @@ int main(int argc, const char **argv)
 
        umask(077);
 
-       argc = parse_options(argc, argv, NULL, options, usage, 0);
+       argc = parse_options(argc, (const char **)argv, NULL, options, usage, 0);
        if (argc != 1)
                usage_with_options(usage, options);
        op = argv[0];