Merge branch 'maint'
* maint: handle_options in git wrapper miscounts the options it handled.
This commit is contained in:
commit
cd8d918601
1
git.c
1
git.c
@ -66,6 +66,7 @@ static int handle_options(const char*** argv, int* argc)
|
|||||||
setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
|
setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
|
||||||
(*argv)++;
|
(*argv)++;
|
||||||
(*argc)--;
|
(*argc)--;
|
||||||
|
handled++;
|
||||||
} else if (!prefixcmp(cmd, "--git-dir=")) {
|
} else if (!prefixcmp(cmd, "--git-dir=")) {
|
||||||
setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
|
setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
|
||||||
} else if (!strcmp(cmd, "--bare")) {
|
} else if (!strcmp(cmd, "--bare")) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user