Merge branch 'gb/split-cmdline-errmsg'

* gb/split-cmdline-errmsg:
  split_cmdline: Allow caller to access error string
This commit is contained in:
Junio C Hamano
2010-08-21 23:28:55 -07:00
4 changed files with 18 additions and 4 deletions

3
git.c
View File

@ -188,7 +188,8 @@ static int handle_alias(int *argcp, const char ***argv)
}
count = split_cmdline(alias_string, &new_argv);
if (count < 0)
die("Bad alias.%s string", alias_command);
die("Bad alias.%s string: %s", alias_command,
split_cmdline_strerror(count));
option_count = handle_options(&new_argv, &count, &envchanged);
if (envchanged)
die("alias '%s' changes environment variables\n"