From d99e547173a73109520bc5d54333b12f0e8cf72e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jakub=20=C4=8Cajka?= Date: Wed, 11 Jun 2014 09:37:15 +0200 Subject: [PATCH] Fixed merge REUC test for big-endian 64-bit --- tests/merge/merge_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index 154985f11..e3e703943 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -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) -- 2.39.5