mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-config-alias-fix'

Browse Source 
* jk/maint-config-alias-fix:
  handle_options(): do not miscount how many arguments were used
  config: always parse GIT_CONFIG_PARAMETERS during git_config
  git_config: don't peek at global config_parameters
  config: make environment parsing routines static

Conflicts:
	config.c
This commit is contained in:
Junio C Hamano
2011-05-30 20:19:14 -07:00
parent fb674d7671 73546c085d
commit 1f9a980636
4 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git.c
View File

@ -66,7 +66,7 @@ static void commit_pager_choice(void) {
static int handle_options(const char ***argv, int *argc, int *envchanged)
{
int handled = 0;
const char **orig_argv = *argv;
while (*argc > 0) {
const char *cmd = (*argv)[0];
@ -122,7 +122,6 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
(*argv)++;
(*argc)--;
handled++;
} else if (!prefixcmp(cmd, "--git-dir=")) {
setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1);
if (envchanged)
@ -162,9 +161,8 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
(*argv)++;
(*argc)--;
handled++;
}
return handled;
return (*argv) - orig_argv;
}
static int handle_alias(int *argcp, const char ***argv)