diff --git a/git.c b/git.c
index fdea1104079d21ea00f408d4fd5fd36fce4b24a8..6a255839e7163020533d89fc41280e2479eae4a8 100644
--- a/git.c
+++ b/git.c
@@ -620,6 +620,7 @@ int main(int argc, char **av)
 {
 	const char **argv = (const char **) av;
 	const char *cmd;
+	int done_help = 0;
 
 	startup_info = &git_startup_info;
 
@@ -682,9 +683,7 @@ int main(int argc, char **av)
 	setup_path();
 
 	while (1) {
-		static int done_help = 0;
-		static int was_alias = 0;
-		was_alias = run_argv(&argc, &argv);
+		int was_alias = run_argv(&argc, &argv);
 		if (errno != ENOENT)
 			break;
 		if (was_alias) {