Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-stash.sh: don't default to refs/stash if invalid ref supplied
[gitweb.git]
/
builtin-merge.c
diff --git
a/builtin-merge.c
b/builtin-merge.c
index b280444e10d67355da6fd0d9e1a2dd2d7a29d440..dcaf3681dc4433a0a258010f2b0a06fc26dc2212 100644
(file)
--- a/
builtin-merge.c
+++ b/
builtin-merge.c
@@
-442,6
+442,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++;