From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2015 23:01:28 +0000 (-0700)
Subject: Merge branch 'ak/git-done-help-cleanup'
X-Git-Tag: v2.4.0-rc0~46
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/860b05b77b876b0e9bd2f32f1d3b518f64c7b87b?hp=-c

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

Code simplification.

* ak/git-done-help-cleanup:
git: make was_alias and done_help non-static
---

860b05b77b876b0e9bd2f32f1d3b518f64c7b87b
diff --combined git.c
index 8c7ee9c830,29268d2f8e..8b5659b208
--- a/git.c
+++ b/git.c
@@@ -6,7 -6,7 +6,7 @@@
  const char git_usage_string[] =
  	"git [--version] [--help] [-C <path>] [-c name=value]\n"
  	"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
 -	"           [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]\n"
 +	"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
  	"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
  	"           <command> [<args>]";
  
@@@ -618,6 -618,7 +618,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;
  
@@@ -680,9 -681,7 +681,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) {