diff options
| author | Jakub Čajka <jcajka@redhat.com> | 2014-06-11 09:37:15 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-11 12:36:39 +0200 |
| commit | 8a89bdae17cafad1ec433ff413732be3e89896b6 (patch) | |
| tree | 0c9eb5c0b2fcd679baf535b7e5492c3b9ab55da4 | |
| parent | e8b6f55f3ef7532268616fba84d9006167ecb892 (diff) | |
| download | libgit2-8a89bdae17cafad1ec433ff413732be3e89896b6.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) |