summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-27 09:46:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-27 09:46:47 -0700
commit1666246b702379275fe87cbbbf6111a74d00d825 (patch)
tree4fc58712bd97b618be4420fa0bf7f9e241ea8ef3 /git.c
parentshell: Rewrite documentation and improve error message (diff)
parentsplit_cmdline: Allow caller to access error string (diff)
downloadtgif-1666246b702379275fe87cbbbf6111a74d00d825.tar.xz
Merge branch 'gb/split-cmdline-errmsg' into gb/shell-ext
* gb/split-cmdline-errmsg: split_cmdline: Allow caller to access error string
Diffstat (limited to 'git.c')
-rw-r--r--git.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/git.c b/git.c
index 17538117a5..da56f31a67 100644
--- a/git.c
+++ b/git.c
@@ -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"