Sync with Git 2.24.1

diff --cc Documentation/gitmodules.txt
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc compat/mingw.c
Simple merge

diff --cc compat/mingw.h
Simple merge

diff --cc fsck.c
index ac4ba4c8e8899d42a9684b9ea43f4e72a57f3761,ef8b343a72011b56ed3004894f3f4ae4f42d78a9..640d813d8430c6835ab1068c0c4512560e91c2b8
--- 1/fsck.c
--- 2/fsck.c
+++ b/fsck.c
@@@ -618,8 -593,24 +619,24 @@@ static int fsck_tree(const struct objec
                                                 ".gitmodules is a symbolic link");
                }
  
 -                                              retval += report(options, &item->object,
+               if ((backslash = strchr(name, '\\'))) {
+                       while (backslash) {
+                               backslash++;
+                               has_dotgit |= is_ntfs_dotgit(backslash);
+                               if (is_ntfs_dotgitmodules(backslash)) {
+                                       if (!S_ISLNK(mode))
+                                               oidset_insert(&gitmodules_found, oid);
+                                       else
++                                              retval += report(options, oid, OBJ_TREE,
+                                                                FSCK_MSG_GITMODULES_SYMLINK,
+                                                                ".gitmodules is a symbolic link");
+                               }
+                               backslash = strchr(backslash, '\\');
+                       }
+               }
+ 
                if (update_tree_entry_gently(&desc)) {
 -                      retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
 +                      retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
                        break;
                }
  
@@@ -931,6 -982,12 +948,12 @@@ static int fsck_gitmodules_fn(const cha
                                    FSCK_MSG_GITMODULES_PATH,
                                    "disallowed submodule path: %s",
                                    value);
 -              data->ret |= report(data->options, data->obj,
+       if (!strcmp(key, "update") && value &&
+           parse_submodule_update_type(value) == SM_UPDATE_COMMAND)
++              data->ret |= report(data->options, data->oid, OBJ_BLOB,
+                                   FSCK_MSG_GITMODULES_UPDATE,
+                                   "disallowed submodule update setting: %s",
+                                   value);
        free(name);
  
        return 0;

diff --cc git-compat-util.h
Simple merge

diff --cc path.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc t/t0060-path-utils.sh
Simple merge

diff --cc t/t1450-fsck.sh
Simple merge

diff --cc t/t9300-fast-import.sh
Simple merge

diff --cc t/t9350-fast-export.sh
Simple merge

diff --cc tree-walk.c
Simple merge

diff --cc unpack-trees.c
Simple merge