diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 08:27:53 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 08:27:53 -0700 |
| commit | c9c6cc8d7db312b9e8502f8d55422b8309cde2f3 (patch) | |
| tree | f13048eaaa0dd450171d2bce68ebe17e7c3a1847 /builtin-merge.c | |
| parent | Fix submodule sync with relative submodule URLs (diff) | |
| parent | Update release notes for 1.6.0.3 (diff) | |
| download | tgif-c9c6cc8d7db312b9e8502f8d55422b8309cde2f3.tar.xz | |
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
checkout: Do not show local changes when in quiet mode
for-each-ref: Fix --format=%(subject) for log message without newlines
git-stash.sh: don't default to refs/stash if invalid ref supplied
maint: check return of split_cmdline to avoid bad config strings
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 9ad9791068..1094c5fd58 100644 --- 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++; |