diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:55 -0700 |
| commit | b95d0a2f8cb2923fed417e649a66c7372b968248 (patch) | |
| tree | dfeb2f5f2e8c756d34cece809ff0f7ef428c9fda /builtin | |
| parent | Merge branch 'so/http-user-agent' (diff) | |
| parent | split_cmdline: Allow caller to access error string (diff) | |
| download | tgif-b95d0a2f8cb2923fed417e649a66c7372b968248.tar.xz | |
Merge branch 'gb/split-cmdline-errmsg'
* gb/split-cmdline-errmsg:
split_cmdline: Allow caller to access error string
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 1bcf7fd9d5..47e705ba9b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -486,7 +486,8 @@ static int git_merge_config(const char *k, const char *v, void *cb) buf = xstrdup(v); argc = split_cmdline(buf, &argv); if (argc < 0) - die("Bad branch.%s.mergeoptions string", branch); + die("Bad branch.%s.mergeoptions string: %s", branch, + split_cmdline_strerror(argc)); argv = xrealloc(argv, sizeof(*argv) * (argc + 2)); memmove(argv + 1, argv, sizeof(*argv) * (argc + 1)); argc++; |