diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-11 11:41:23 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-02-11 11:41:23 -0800 |
| commit | 263e674ec6701b774d8f464150a9d30650c6da46 (patch) | |
| tree | 4e3c5b752c2425ce3f4b07716eccfb260f5af41b | |
| parent | ad8aa11288d6cb25d7a26e133759e41b79670b4c (diff) | |
| download | libgit2-263e674ec6701b774d8f464150a9d30650c6da46.tar.gz | |
merge tests: correct casts
| -rw-r--r-- | tests/merge/workdir/dirty.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c index f168963b2..994a1d813 100644 --- a/tests/merge/workdir/dirty.c +++ b/tests/merge/workdir/dirty.c @@ -162,8 +162,8 @@ static void hack_index(char *files[]) cl_git_pass(p_utimes(path.ptr, times)); cl_git_pass(p_stat(path.ptr, &statbuf)); - entry->ctime.seconds = (git_time_t)statbuf.st_ctime; - entry->mtime.seconds = (git_time_t)statbuf.st_mtime; + entry->ctime.seconds = (int32_t)statbuf.st_ctime; + entry->mtime.seconds = (int32_t)statbuf.st_mtime; #if defined(GIT_USE_NSEC) entry->ctime.nanoseconds = statbuf.st_ctim.tv_nsec; entry->mtime.nanoseconds = statbuf.st_mtim.tv_nsec; @@ -175,7 +175,7 @@ static void hack_index(char *files[]) entry->ino = statbuf.st_ino; entry->uid = statbuf.st_uid; entry->gid = statbuf.st_gid; - entry->file_size = statbuf.st_size; + entry->file_size = (uint32_t)statbuf.st_size; } git_buf_free(&path); |