From: Junio C Hamano <junkio@cox.net>
Date: Fri, 13 Apr 2007 04:04:09 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd8d918601e28d3aa86b63eeea223b86d71ce1b6?hp=2bfe3cec92be4f5e3bfc0e71ed560df4a726c07b

Merge branch 'maint'

* maint:
handle_options in git wrapper miscounts the options it handled.
---

diff --git a/git.c b/git.c
index 33dd4d39d9..7def319e60 100644
--- 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")) {