X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=test-subprocess.c;h=f2d4c0d22bd418836eb47424a03d0e903246d92e;hb=09b90fb3c065ac5ac2ad051596b036131ecedbd5;hp=8926bc52a9a6e2a16924664372a8af3ee2ed3136;hpb=c58499c317ccb04aba4e0c5b3bee78683027f095;p=git.git

diff --git a/test-subprocess.c b/test-subprocess.c
index 8926bc52a..f2d4c0d22 100644
--- a/test-subprocess.c
+++ b/test-subprocess.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "run-command.h"
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
 	struct child_process cp;
 	int nogit = 0;
@@ -9,12 +9,12 @@ int main(int argc, char **argv)
 	setup_git_directory_gently(&nogit);
 	if (nogit)
 		die("No git repo found");
-	if (!strcmp(argv[1], "--setup-work-tree")) {
+	if (argc > 1 && !strcmp(argv[1], "--setup-work-tree")) {
 		setup_work_tree();
 		argv++;
 	}
 	memset(&cp, 0, sizeof(cp));
 	cp.git_cmd = 1;
-	cp.argv = (const char **)argv+1;
+	cp.argv = argv + 1;
 	return run_command(&cp);
 }