diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/branch.c | 7 | ||||
| -rw-r--r-- | src/rebase.c | 1 | ||||
| -rw-r--r-- | src/win32/git2.rc | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/branch.c b/src/branch.c index b4e4b0564..b39d74749 100644 --- a/src/branch.c +++ b/src/branch.c @@ -138,8 +138,13 @@ int git_branch_delete(git_reference *branch) if (git_reference_delete(branch) < 0) goto on_error; - if (git_reflog_delete(git_reference_owner(branch), git_reference_name(branch)) < 0) + if ((error = git_reflog_delete(git_reference_owner(branch), git_reference_name(branch))) < 0) { + if (error == GIT_ENOTFOUND) { + giterr_clear(); + error = 0; + } goto on_error; + } error = 0; diff --git a/src/rebase.c b/src/rebase.c index 8078eedc3..cf3558d16 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -576,6 +576,7 @@ static int rebase_init_operations( continue; operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL); + GITERR_CHECK_ALLOC(operation); } error = 0; diff --git a/src/win32/git2.rc b/src/win32/git2.rc index 22c63f695..b2e59807b 100644 --- a/src/win32/git2.rc +++ b/src/win32/git2.rc @@ -6,8 +6,8 @@ #endif VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE - FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,0 - PRODUCTVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,0 + FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH + PRODUCTVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG |