From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Sep 2010 16:17:01 +0000 (-0700)
Subject: Merge branch 'tf/cleanup-builtin-help-headers'
X-Git-Tag: v1.7.3-rc1~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/154adcf9c08218077275f7a4c7a6e61632516561?ds=inline;hp=-c

Merge branch 'tf/cleanup-builtin-help-headers'

* tf/cleanup-builtin-help-headers:
builtin.h: Move two functions definitions to help.h.
---

154adcf9c08218077275f7a4c7a6e61632516561
diff --combined git.c
index ce4bcfec03,795f75e56d..50a14013c5
--- a/git.c
+++ b/git.c
@@@ -1,6 -1,7 +1,7 @@@
  #include "builtin.h"
- #include "exec_cmd.h"
  #include "cache.h"
+ #include "exec_cmd.h"
+ #include "help.h"
  #include "quote.h"
  #include "run-command.h"
  
@@@ -56,6 -57,9 +57,6 @@@ static int handle_options(const char **
  {
  	int handled = 0;
  
 -	if (!getenv("GIT_ASKPASS") && getenv("SSH_ASKPASS"))
 -		setenv("GIT_ASKPASS", getenv("SSH_ASKPASS"), 1);
 -
  	while (*argc > 0) {
  		const char *cmd = (*argv)[0];
  		if (cmd[0] != '-')
@@@ -134,7 -138,7 +135,7 @@@
  				fprintf(stderr, "-c expects a configuration string\n" );
  				usage(git_usage_string);
  			}
 -			git_config_parse_parameter((*argv)[1]);
 +			git_config_push_parameter((*argv)[1]);
  			(*argv)++;
  			(*argc)--;
  		} else {