summaryrefslogtreecommitdiffstats
path: root/tree-walk.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
commit14a8168e2fed3934f1f9afb286f1c64345d06790 (patch)
treefc622bb0da0f89762a03bf6bb17b3bdc66e7eb92 /tree-walk.c
parentMerge branch 'sb/merge-commit-msg-hook' (diff)
parentALLOC_GROW: avoid -Wsign-compare warnings (diff)
downloadgit-14a8168e2fed3934f1f9afb286f1c64345d06790.tar.xz
git-14a8168e2fed3934f1f9afb286f1c64345d06790.zip
Merge branch 'rj/no-sign-compare'
Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings
Diffstat (limited to 'tree-walk.c')
-rw-r--r--tree-walk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tree-walk.c b/tree-walk.c
index c99309069a9..684f0e33736 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -582,12 +582,11 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
int retval = MISSING_OBJECT;
struct dir_state *parents = NULL;
size_t parents_alloc = 0;
- ssize_t parents_nr = 0;
+ size_t i, parents_nr = 0;
unsigned char current_tree_sha1[20];
struct strbuf namebuf = STRBUF_INIT;
struct tree_desc t;
int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
- int i;
init_tree_desc(&t, NULL, 0UL);
strbuf_addstr(&namebuf, name);