diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
| commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
| tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /src/commit.c | |
| parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
| parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) | |
| download | libgit2-e25dda51c4dc47ed99f95dae6486c6275b119484.tar.gz | |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'src/commit.c')
| -rw-r--r-- | src/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commit.c b/src/commit.c index 32c47944b..b66978aff 100644 --- a/src/commit.c +++ b/src/commit.c @@ -226,7 +226,7 @@ GIT_COMMIT_GETTER(const char *, message, commit->message) GIT_COMMIT_GETTER(const char *, message_encoding, commit->message_encoding) GIT_COMMIT_GETTER(git_time_t, time, commit->committer->when.time) GIT_COMMIT_GETTER(int, time_offset, commit->committer->when.offset) -GIT_COMMIT_GETTER(unsigned int, parentcount, commit->parent_oids.length) +GIT_COMMIT_GETTER(unsigned int, parentcount, (unsigned int)commit->parent_oids.length) GIT_COMMIT_GETTER(const git_oid *, tree_oid, &commit->tree_oid); int git_commit_tree(git_tree **tree_out, git_commit *commit) |