]> git.proxmox.com Git - libgit2.git/commitdiff
Fixed merge REUC test for big-endian 64-bit
authorJakub Čajka <jcajka@redhat.com>
Wed, 11 Jun 2014 07:37:15 +0000 (09:37 +0200)
committerJacques Germishuys <jacquesg@striata.com>
Fri, 26 Sep 2014 10:12:08 +0000 (12:12 +0200)
tests/merge/merge_helpers.c

index 154985f11effe24a45acacecfb280bfab4d0a051..e3e703943894266f249ae7a0f0b20f7cd167ad7c 100644 (file)
@@ -327,7 +327,7 @@ int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[],
 
 int dircount(void *payload, git_buf *pathbuf)
 {
-       int *entries = payload;
+       size_t *entries = payload;
        size_t len = git_buf_len(pathbuf);
 
        if (len < 5 || strcmp(pathbuf->ptr + (git_buf_len(pathbuf) - 5), "/.git") != 0)