mirror of
https://git.proxmox.com/git/libgit2
synced 2025-06-23 16:03:51 +00:00
Merge pull request #2552 from KindDragon/master
Several CppCat warnings fixed
This commit is contained in:
commit
eb939c5772
@ -316,7 +316,6 @@ static int blame_internal(git_blame *blame)
|
||||
ent->suspect = o;
|
||||
|
||||
blame->ent = ent;
|
||||
blame->path = blame->path;
|
||||
|
||||
git_blame__like_git(blame, blame->options.flags);
|
||||
|
||||
|
@ -648,9 +648,6 @@ int git_packfile_unpack(
|
||||
base_type = elem->type;
|
||||
}
|
||||
|
||||
if (error < 0)
|
||||
goto cleanup;
|
||||
|
||||
switch (base_type) {
|
||||
case GIT_OBJ_COMMIT:
|
||||
case GIT_OBJ_TREE:
|
||||
|
@ -634,7 +634,8 @@ int git_stash_drop(
|
||||
entry = git_reflog_entry_byindex(reflog, 0);
|
||||
|
||||
git_reference_free(stash);
|
||||
if ((error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1, NULL, NULL) < 0))
|
||||
error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1, NULL, NULL);
|
||||
if (error < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* We need to undo the writing that we just did */
|
||||
|
@ -314,7 +314,7 @@ static int wait_while_ack(gitno_buffer *buf)
|
||||
break;
|
||||
|
||||
if (pkt->type == GIT_PKT_ACK &&
|
||||
(pkt->status != GIT_ACK_CONTINUE ||
|
||||
(pkt->status != GIT_ACK_CONTINUE &&
|
||||
pkt->status != GIT_ACK_COMMON)) {
|
||||
git__free(pkt);
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user