diff options
| author | Russell Belfer <rb@github.com> | 2013-12-12 14:58:18 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-12-12 14:58:18 -0800 |
| commit | 25a1fab0a96fd87e4ebc4ec195ac59a4213e92ad (patch) | |
| tree | e8e75570944a76fc1d5fca907ccc924f8e7db0a3 /src/merge.c | |
| parent | 0eedacb06ae07fd0d784066ad41383276e05d92e (diff) | |
| parent | 86a05ef382438b22d2ffaaa1a77814781243bc80 (diff) | |
| download | libgit2-25a1fab0a96fd87e4ebc4ec195ac59a4213e92ad.tar.gz | |
Merge pull request #2001 from ethomson/merge_version_validate
Validate struct versions in merge, revert
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c index 45387d4ad..00415cbc0 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1575,6 +1575,8 @@ int git_merge_trees( *out = NULL; + GITERR_CHECK_VERSION(given_opts, GIT_MERGE_TREE_OPTS_VERSION, "git_merge_tree_opts"); + if ((error = merge_tree_normalize_opts(repo, &opts, given_opts)) < 0) return error; @@ -2427,6 +2429,8 @@ int git_merge( *out = NULL; + GITERR_CHECK_VERSION(given_opts, GIT_MERGE_OPTS_VERSION, "git_merge_opts"); + if (their_heads_len != 1) { giterr_set(GITERR_MERGE, "Can only merge a single branch"); return -1; |