diff options
author | Junio C Hamano <junkio@cox.net> | 2007-04-12 21:04:09 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-04-12 21:04:09 -0700 |
commit | cd8d918601e28d3aa86b63eeea223b86d71ce1b6 (patch) | |
tree | f73e863ab694f1c9aaab91525fd187afcc9f98d1 | |
parent | Fix git {log,show,...} --pretty=email (diff) | |
parent | handle_options in git wrapper miscounts the options it handled. (diff) | |
download | tgif-cd8d918601e28d3aa86b63eeea223b86d71ce1b6.tar.xz |
Merge branch 'maint'
* maint:
handle_options in git wrapper miscounts the options it handled.
-rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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")) { |