From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Mar 2015 18:23:35 +0000 (-0700)
Subject: Merge branch 'ak/git-done-help-cleanup' into maint
X-Git-Tag: v2.3.4~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a4f287e5aa5cffec32bdc94042be58d160fd851e?ds=inline;hp=-c

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
---

a4f287e5aa5cffec32bdc94042be58d160fd851e
diff --combined git.c
index fdea110407,29268d2f8e..6a255839e7
--- a/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) {