fetch-pack: use file-scope static struct for fsck_options
Change code added in 5476e1efde (fetch-pack: print and use dangling .gitmodules, 2021-02-22) so that we use a file-scoped "static struct fsck_options" instead of defining one in the "fsck_gitmodules_oids()" function. We use this pattern in all of builtin/{fsck,index-pack,mktag,unpack-objects}.c. It's odd to see fetch-pack be the odd one out. One might think that we're using other fsck_options structs in fetch-pack, or doing on fsck twice there, but we're not. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Mar 28, 2021 at 15:15 UTC
c96e184cae4294a4ebd18a1bdf8d6514445f32e4
1 file changed
+3
-3
fetch-pack.c
+3
-3
@@ -38,6 +38,7 @@ static int server_supports_filtering;
38
static int advertise_sid;
39
static struct shallow_lock shallow_lock;
40
static const char *alternate_shallow_file;
41
+static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
42
static struct strbuf fsck_msg_types = STRBUF_INIT;
43
static struct string_list uri_protocols = STRING_LIST_INIT_DUP;
44
@@ -991,15 +992,14 @@ static void fsck_gitmodules_oids(struct oidset *gitmodules_oids)
992
{
993
struct oidset_iter iter;
994
const struct object_id *oid;
994
- struct fsck_options fo = FSCK_OPTIONS_STRICT;
995
996
if (!oidset_size(gitmodules_oids))
997
return;
998
999
oidset_iter_init(gitmodules_oids, &iter);
1000
while ((oid = oidset_iter_next(&iter)))
1001
- register_found_gitmodules(&fo, oid);
1002
- if (fsck_finish(&fo))
1001
+ register_found_gitmodules(&fsck_options, oid);
1002
+ if (fsck_finish(&fsck_options))
1003
die("fsck failed");
1004
}
1005