summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-22 06:28:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-22 06:28:55 (GMT)
commitb95d0a2f8cb2923fed417e649a66c7372b968248 (patch)
treedfeb2f5f2e8c756d34cece809ff0f7ef428c9fda /git.c
parentdfdb1e4150fb9c9ee86186e89987dc565bc91ead (diff)
parentad9ac6db5d58de08d0497b9184e86926377c20dd (diff)
downloadgit-b95d0a2f8cb2923fed417e649a66c7372b968248.zip
git-b95d0a2f8cb2923fed417e649a66c7372b968248.tar.gz
git-b95d0a2f8cb2923fed417e649a66c7372b968248.tar.bz2
Merge branch 'gb/split-cmdline-errmsg'
* 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 f37028b..6fc07a5 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"