Merge pull request #2001 from ethomson/merge_version_validate

Validate struct versions in merge, revert

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;

src/revert.c

@@ -179,6 +179,8 @@ int git_revert(
 
 	assert(repo && commit);
 
+	GITERR_CHECK_VERSION(given_opts, GIT_REVERT_OPTS_VERSION, "git_revert_opts");
+
 	if ((error = git_repository__ensure_not_bare(repo, "revert")) < 0)
 		return error;