Merge branch 'bc/sha-256-part-2'

[thirdparty/git.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index b9b3350f762fa4d0d9c90fccfe137165b2b16339..f82e2fe9e302fed2e9ebf44c0323628cb94576f0 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -598,7 +598,7 @@ static int verify_ordered(unsigned mode1, const char *name1,
 
        /*
         * There can be non-consecutive duplicates due to the implicitly
-        * add slash, e.g.:
+        * added slash, e.g.:
         *
         *   foo
         *   foo.bar
@@ -620,7 +620,7 @@ static int verify_ordered(unsigned mode1, const char *name1,
                        if (!f_name)
                                break;
                        if (!skip_prefix(name2, f_name, &p))
-                               break;
+                               continue;
                        if (!*p)
                                return TREE_HAS_DUPS;
                        if (is_less_than_slash(*p)) {
@@ -1133,7 +1133,7 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
 {
        struct fsck_gitmodules_data *data = vdata;
        const char *subsection, *key;
-       int subsection_len;
+       size_t subsection_len;
        char *name;
 
        if (parse_config_key(var, "submodule", &subsection, &subsection_len, &key) < 0 ||