proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 22:32:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2955 from git-up/update_tips_fixes

Browse Source 
Update tips fixes
This commit is contained in:
Carlos Martín Nieto 2015-03-18 05:04:12 +01:00
commit 03b51b5d94
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/push.c
View File

@ -180,6 +180,10 @@ int git_push_update_tips(git_push *push)
git_vector_foreach(&push->status, i, status) {
int fire_callback = 1;
/* Skip unsuccessful updates which have non-empty messages */
if (status->msg)
continue;
/* Find the corresponding remote ref */
fetch_spec = git_remote__matching_refspec(push->remote, status->ref);
if (!fetch_spec)
@ -198,8 +202,6 @@ int git_push_update_tips(git_push *push)
if (j == push->specs.length)
continue;
/* If this ref update was successful (ok, not ng), it will have an empty message */
if (status->msg == NULL) {
/* Update the remote ref */
if (git_oid_iszero(&push_spec->loid)) {
error = git_reference_lookup(&remote_ref, push->remote->repo, git_buf_cstr(&remote_ref_name));
@ -213,7 +215,6 @@ int git_push_update_tips(git_push *push)
git_buf_cstr(&remote_ref_name), &push_spec->loid, 1,
"update by push");
}
}
if (error < 0) {
if (error != GIT_ENOTFOUND)

4
src/remote.c
View File

@ -2329,6 +2329,10 @@ int git_remote_upload(git_remote *remote, const git_strarray *refspecs, const gi
(error = git_remote_connect(remote, GIT_DIRECTION_PUSH)) < 0)
goto cleanup;
free_refspecs(&remote->active_refspecs);
if (dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs) < 0)
goto cleanup;
if (remote->push) {
git_push_free(remote->push);
remote->push = NULL;