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

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-17 16:01:28 -07:00
commit 860b05b77b

5
git.c
View File

@ -618,6 +618,7 @@ int main(int argc, char **av)
{ {
const char **argv = (const char **) av; const char **argv = (const char **) av;
const char *cmd; const char *cmd;
int done_help = 0;
startup_info = &git_startup_info; startup_info = &git_startup_info;
@ -680,9 +681,7 @@ int main(int argc, char **av)
setup_path(); setup_path();
while (1) { while (1) {
static int done_help = 0; int was_alias = run_argv(&argc, &argv);
static int was_alias = 0;
was_alias = run_argv(&argc, &argv);
if (errno != ENOENT) if (errno != ENOENT)
break; break;
if (was_alias) { if (was_alias) {