merge tests: correct casts

This commit is contained in:
Edward Thomson 2016-02-11 11:41:23 -08:00
parent ad8aa11288
commit 263e674ec6

View File

@ -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);