diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-19 01:36:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-19 01:36:40 +0000 |
| commit | b2c2dc643b2bd3d440a25a2ce3d64427dc28d4de (patch) | |
| tree | 771ce3175bd58276ae06a6908dd6d54a3a847f95 /src/odb.c | |
| parent | c352e5617ac56feec258e9a094460aa4da6e00ec (diff) | |
| parent | 83151018ef0228b53739cbc2bc785a673752c349 (diff) | |
| download | libgit2-b2c2dc643b2bd3d440a25a2ce3d64427dc28d4de.tar.gz | |
Merge pull request #4940 from libgit2/ethomson/git_obj
More `git_obj` to `git_object` updates
Diffstat (limited to 'src/odb.c')
| -rw-r--r-- | src/odb.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -63,7 +63,7 @@ static git_object_t odb_hardcoded_type(const git_oid *id) if (!git_oid_cmp(id, &empty_tree)) return GIT_OBJECT_TREE; - return GIT_OBJECT_BAD; + return GIT_OBJECT_INVALID; } static int odb_read_hardcoded(bool *found, git_rawobj *raw, const git_oid *id) @@ -72,7 +72,7 @@ static int odb_read_hardcoded(bool *found, git_rawobj *raw, const git_oid *id) *found = false; - if ((type = odb_hardcoded_type(id)) == GIT_OBJECT_BAD) + if ((type = odb_hardcoded_type(id)) == GIT_OBJECT_INVALID) return 0; raw->type = type; @@ -945,7 +945,7 @@ static int odb_read_header_1( bool passthrough = false; int error; - if (!only_refreshed && (ht = odb_hardcoded_type(id)) != GIT_OBJECT_BAD) { + if (!only_refreshed && (ht = odb_hardcoded_type(id)) != GIT_OBJECT_INVALID) { *type_p = ht; *len_p = 0; return 0; |
