Fixed merge REUC test for big-endian 64-bit

8a89bdae · Jakub Čajka · Carlos Martín Nieto · e8b6f55f · 8a89bdae
Commit 8a89bdae authored Jun 11, 2014 by Jakub Čajka Committed by Carlos Martín Nieto Oct 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

tests/merge/merge_helpers.c
+1 -1

No files found.
--- 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)