]> git.ipfire.org Git - thirdparty/git.git/commitdiff
read-cache: reindent
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Jul 2026 17:25:21 +0000 (10:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Jul 2026 17:26:47 +0000 (10:26 -0700)
I do not know how this happened without anybody noticing, but a few
months ago we added a16c4a245a (read-cache: submodule add need
--force given ignore=all configuration, 2026-02-06), and almost all
lines the patch added were incorrectly indented.

Reindent these lines so that they play better with surrounding lines
in the same file.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c

index 38b55323dd739a74b1810d836e90985bcbd268fe..58c378414a661809c1c6ec3b29015b2b518bc7be 100644 (file)
@@ -3910,32 +3910,33 @@ static int fix_unmerged_status(struct diff_filepair *p,
 }
 
 static int skip_submodule(const char *path,
-                                               struct repository *repo,
-                                               struct pathspec *pathspec,
-                                               int ignored_too)
-{
-    struct stat st;
-    const struct submodule *sub;
-    int pathspec_matches = 0;
-    int ps_i;
-    char *norm_pathspec = NULL;
-
-    /* Only consider if path is a directory */
-    if (lstat(path, &st) || !S_ISDIR(st.st_mode))
+                         struct repository *repo,
+                         struct pathspec *pathspec,
+                         int ignored_too)
+{
+       struct stat st;
+       const struct submodule *sub;
+       int pathspec_matches = 0;
+       int ps_i;
+       char *norm_pathspec = NULL;
+
+       /* Only consider if path is a directory */
+       if (lstat(path, &st) || !S_ISDIR(st.st_mode))
                return 0;
 
-    /* Check if it's a submodule with ignore=all */
-    sub = submodule_from_path(repo, null_oid(the_hash_algo), path);
-    if (!sub || !sub->name || !sub->ignore || strcmp(sub->ignore, "all"))
+       /* Check if it's a submodule with ignore=all */
+       sub = submodule_from_path(repo, null_oid(the_hash_algo), path);
+       if (!sub || !sub->name || !sub->ignore || strcmp(sub->ignore, "all"))
                return 0;
 
-    trace_printf("ignore=all: %s\n", path);
-    trace_printf("pathspec %s\n", (pathspec && pathspec->nr)
-                                                                       ? "has pathspec"
-                                                                       : "no pathspec");
+       trace_printf("ignore=all: %s\n", path);
+       trace_printf("pathspec %s\n",
+                    ((pathspec && pathspec->nr)
+                     ? "has pathspec"
+                     : "no pathspec"));
 
-    /* Check if submodule path is explicitly mentioned in pathspec */
-    if (pathspec) {
+       /* Check if submodule path is explicitly mentioned in pathspec */
+       if (pathspec) {
                for (ps_i = 0; ps_i < pathspec->nr; ps_i++) {
                        const char *m = pathspec->items[ps_i].match;
                        if (!m)
@@ -3949,28 +3950,29 @@ static int skip_submodule(const char *path,
                        }
                        FREE_AND_NULL(norm_pathspec);
                }
-    }
+       }
 
-    /* If explicitly matched and forced, allow adding */
-    if (pathspec_matches) {
+       /* If explicitly matched and forced, allow adding */
+       if (pathspec_matches) {
                if (ignored_too && ignored_too > 0) {
                        trace_printf("Add submodule due to --force: %s\n", path);
                        return 0;
                } else {
                        advise_if_enabled(ADVICE_ADD_IGNORED_FILE,
-                               _("Skipping submodule due to ignore=all: %s\n"
-                                       "Use --force if you really want to add the submodule."), path);
+                                 _("Skipping submodule due to ignore=all: %s\n"
+                                   "Use --force if you really want to "
+                                   "add the submodule."), path);
                        return 1;
                }
-    }
+       }
 
-    /* No explicit pathspec match -> skip silently */
-    trace_printf("Pathspec to submodule does not match explicitly: %s\n", path);
-    return 1;
+       /* No explicit pathspec match -> skip silently */
+       trace_printf("Pathspec to submodule does not match explicitly: %s\n", path);
+       return 1;
 }
 
 static void update_callback(struct diff_queue_struct *q,
-                                                       struct diff_options *opt UNUSED, void *cbdata)
+                           struct diff_options *opt UNUSED, void *cbdata)
 {
        int i;
        struct update_callback_data *data = cbdata;
@@ -3980,7 +3982,7 @@ static void update_callback(struct diff_queue_struct *q,
                const char *path = p->one->path;
 
                if (!data->include_sparse &&
-                       !path_in_sparse_checkout(path, data->index))
+                   !path_in_sparse_checkout(path, data->index))
                        continue;
 
                switch (fix_unmerged_status(p, data)) {
@@ -3989,8 +3991,8 @@ static void update_callback(struct diff_queue_struct *q,
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED:
                        if (skip_submodule(path, data->repo,
-                                                               data->pathspec,
-                                                               data->ignored_too))
+                                          data->pathspec,
+                                          data->ignored_too))
                                continue;
 
                        if (add_file_to_index(data->index, path, data->flags)) {