[PATCH 5/6] This assertion is valid for both loose and packed objects
From: Hervé Cauwelier <hidden>
Date: 2016-06-15 22:47:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Hervé Cauwelier <redacted> --- src/odb.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/odb.c b/src/odb.c
index c71948b..a612299 100644
--- a/src/odb.c
+++ b/src/odb.c@@ -1149,11 +1149,10 @@ void git_odb_close(git_odb *db) free(db); } -int git_odb_read( - git_obj *out, - git_odb *db, - const git_oid *id) +int git_odb_read(git_obj *out, git_odb *db, const git_oid *id) { + assert(out && db && id); + attempt: if (!git_odb__read_packed(out, db, id)) return GIT_SUCCESS;
@@ -1171,8 +1170,6 @@ int git_odb__read_loose(git_obj *out, git_odb *db, const git_oid *id) char file[GIT_PATH_MAX]; gitfo_buf obj = GITFO_BUF_INIT; - assert(out && db && id); - out->data = NULL; out->len = 0; out->type = GIT_OBJ_BAD;
--
1.6.5