summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-17 23:01:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-17 23:01:28 (GMT)
commit860b05b77b876b0e9bd2f32f1d3b518f64c7b87b (patch)
tree8fa86ba7b9083c5e5050c92b4ab484e818303e3c /git.c
parentf0b7ab3513cb2bd816b212e66e6716395a683a1c (diff)
parent8fa7975b076ae039f63286601f48e64115e2aba7 (diff)
downloadgit-860b05b77b876b0e9bd2f32f1d3b518f64c7b87b.zip
git-860b05b77b876b0e9bd2f32f1d3b518f64c7b87b.tar.gz
git-860b05b77b876b0e9bd2f32f1d3b518f64c7b87b.tar.bz2
Merge branch 'ak/git-done-help-cleanup'
Code simplification. * ak/git-done-help-cleanup: git: make was_alias and done_help non-static
Diffstat (limited to 'git.c')
-rw-r--r--git.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/git.c b/git.c
index 8c7ee9c..8b5659b 100644
--- a/git.c
+++ b/git.c
@@ -618,6 +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 @@ 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) {