Merge branch 'ak/git-done-help-cleanup' into maint

Code simplification.

* ak/git-done-help-cleanup:
  git: make was_alias and done_help non-static
This commit is contained in:
Junio C Hamano 2015-03-23 11:23:35 -07:00
commit a4f287e5aa

5
git.c
View file

@ -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) {