proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-03 14:38:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2001 from ethomson/merge_version_validate

Browse Source 
Validate struct versions in merge, revert
This commit is contained in:
Russell Belfer 2013-12-12 14:58:18 -08:00
commit 25a1fab0a9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/merge.c
View File

@ -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;

2
src/revert.c
View File

@ -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;