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

diff --combined git.c
index fdea1104079d21ea00f408d4fd5fd36fce4b24a8,29268d2f8e528a49db89f880c2ce7dab4f6d4b71..6a255839e7163020533d89fc41280e2479eae4a8
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -204,12 -204,10 +204,12 @@@ static int handle_options(const char **
                                fprintf(stderr, "No directory given for -C.\n" );
                                usage(git_usage_string);
                        }
 -                      if (chdir((*argv)[1]))
 -                              die_errno("Cannot change to '%s'", (*argv)[1]);
 -                      if (envchanged)
 -                              *envchanged = 1;
 +                      if ((*argv)[1][0]) {
 +                              if (chdir((*argv)[1]))
 +                                      die_errno("Cannot change to '%s'", (*argv)[1]);
 +                              if (envchanged)
 +                                      *envchanged = 1;
 +                      }
                        (*argv)++;
                        (*argc)--;
                } else {
@@@ -620,6 -618,7 +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 -681,7 +683,7 @@@
        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) {