Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mv/commit-tree'
[gitweb.git]
/
builtin-merge.c
diff --git
a/builtin-merge.c
b/builtin-merge.c
index 4a8ec604d390d0b600ee7a6b3d5b74975dbf87d3..1942e72aaf20b10bd8069ef3a736fcc3c4732753 100644
(file)
--- a/
builtin-merge.c
+++ b/
builtin-merge.c
@@
-476,6
+476,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);
argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
argc++;