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

Merge branch 'gb/split-cmdline-errmsg'

Browse Source 
* 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
parent dfdb1e4150 ad9ac6db5d
commit b95d0a2f8c
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/merge.c
View File

@ -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++;