diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-05-05 16:47:20 -0700 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-05-05 16:47:20 -0700 |
| commit | cd58c15c589970765cd46e7bbdaebf6250fd7626 (patch) | |
| tree | f7f95202e96151b3ac7ea22697e7e60825375268 /tests-clar | |
| parent | 48ecd122ea6fb8cf12fb4029974c314e5d9efb62 (diff) | |
| parent | 35cdd261f353696181236328323e8d123cad57d4 (diff) | |
| download | libgit2-cd58c15c589970765cd46e7bbdaebf6250fd7626.tar.gz | |
Merge remote-tracking branch 'scottjg/fix-mingw32' into development
Conflicts:
src/netops.c
src/netops.h
src/transports/http.c
tests-clar/clar
Diffstat (limited to 'tests-clar')
| -rw-r--r-- | tests-clar/object/commit/commitstagedfile.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests-clar/object/commit/commitstagedfile.c b/tests-clar/object/commit/commitstagedfile.c index de69b4496..cd04e96d4 100644 --- a/tests-clar/object/commit/commitstagedfile.c +++ b/tests-clar/object/commit/commitstagedfile.c @@ -83,8 +83,16 @@ void test_object_commit_commitstagedfile__generate_predictable_object_ids(void) struct stat st; cl_must_pass(p_lstat("treebuilder/test.txt", &st)); cl_assert(entry->file_size == st.st_size); +#ifndef _WIN32 + /* + * Windows doesn't populate these fields, and the signage is + * wrong in the Windows version of the struct, so lets avoid + * the "comparing signed and unsigned" compilation warning in + * that case. + */ cl_assert(entry->uid == st.st_uid); cl_assert(entry->gid == st.st_gid); +#endif } /* |