diff options
| author | Vicent Marti <vicent@github.com> | 2014-09-03 12:19:03 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-09-03 12:19:03 +0200 |
| commit | eb939c57725e7c3951153ff1ff67b35f4b22bbf3 (patch) | |
| tree | e81aa43f430ea3751f12abfab82e66962d7227d5 | |
| parent | 6f3082d90fa70144ed4f5ae75c75366fce0a4f5e (diff) | |
| parent | 5cd81bb3d88218d42dd431f2c5011dfa84c287c7 (diff) | |
| download | libgit2-eb939c57725e7c3951153ff1ff67b35f4b22bbf3.tar.gz | |
Merge pull request #2552 from KindDragon/master
Several CppCat warnings fixed
| -rw-r--r-- | src/blame.c | 1 | ||||
| -rw-r--r-- | src/pack.c | 3 | ||||
| -rw-r--r-- | src/stash.c | 3 | ||||
| -rw-r--r-- | src/transports/smart_protocol.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/blame.c b/src/blame.c index eb977c287..2cc5e552b 100644 --- a/src/blame.c +++ b/src/blame.c @@ -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); diff --git a/src/pack.c b/src/pack.c index b05aa91f1..7c1cfe03e 100644 --- a/src/pack.c +++ b/src/pack.c @@ -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: diff --git a/src/stash.c b/src/stash.c index 86e0a627c..22f756e35 100644 --- a/src/stash.c +++ b/src/stash.c @@ -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 */ diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index 82891165f..5ca5065ac 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -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; |