diff options
| author | Jakub Čajka <jcajka@redhat.com> | 2014-06-11 09:37:15 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-09-26 12:12:08 +0200 |
| commit | d99e547173a73109520bc5d54333b12f0e8cf72e (patch) | |
| tree | 9cd1ef3421e199a7ee3ae6f570d1ce1983ce3f20 | |
| parent | ff97778a7a01eb3661418d4dcc1465dc4519fda3 (diff) | |
| download | libgit2-d99e547173a73109520bc5d54333b12f0e8cf72e.tar.gz | |
Fixed merge REUC test for big-endian 64-bit
| -rw-r--r-- | tests/merge/merge_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |