Merge branch 'maint'

Junio C Hamano · Junio C Hamano · commit cd8d918601e2 · 2007-04-12T21:04:09.000-07:00
* maint:
  handle_options in git wrapper miscounts the options it handled.
diff --git a/git.c b/git.c
@@ -66,6 +66,7 @@ static int handle_options(const char*** argv, int* argc)
 			setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
 			(*argv)++;
 			(*argc)--;
+			handled++;
 		} else if (!prefixcmp(cmd, "--git-dir=")) {
 			setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
 		} else if (!strcmp(cmd, "--bare")) {
