Because we introduce ref consistency check. The original "skiplist" is a
common option which is set up during handling user configs. To avoid
causing ambiguity, rename "skiplist" to "oid_skiplist".
Mentored-by: Patrick Steinhardt <ps@xxxxxx>
Mentored-by: Karthik Nayak <karthik.188@xxxxxxxxx>
Signed-off-by: shejialuo <shejialuo@xxxxxxxxx>
---
fsck.c | 4 ++--
fsck.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fsck.c b/fsck.c
index e9848f2678..04d0aa1766 100644
--- a/fsck.c
+++ b/fsck.c
@@ -203,7 +203,7 @@ void fsck_set_msg_types(struct fsck_options *options, const char *values)
if (!strcmp(buf, "skiplist")) {
if (equal == len)
die("skiplist requires a path");
- oidset_parse_file(&options->skiplist, buf + equal + 1);
+ oidset_parse_file(&options->oid_skiplist, buf + equal + 1);
buf += len + 1;
continue;
}
@@ -220,7 +220,7 @@ void fsck_set_msg_types(struct fsck_options *options, const char *values)
static int object_on_skiplist(struct fsck_options *opts,
const struct object_id *oid)
{
- return opts && oid && oidset_contains(&opts->skiplist, oid);
+ return opts && oid && oidset_contains(&opts->oid_skiplist, oid);
}
__attribute__((format (printf, 5, 6)))
diff --git a/fsck.h b/fsck.h
index 37b6f6676f..0c581ef082 100644
--- a/fsck.h
+++ b/fsck.h
@@ -143,13 +143,13 @@ struct fsck_objects_options {
struct fsck_options {
unsigned strict:1;
enum fsck_msg_type *msg_type;
- struct oidset skiplist;
+ struct oidset oid_skiplist;
fsck_error error_func;
struct fsck_objects_options objects_options;
};
#define FSCK_OBJECTS_OPTIONS_DEFAULT { \
- .skiplist = OIDSET_INIT, \
+ .oid_skiplist = OIDSET_INIT, \
.error_func = fsck_error_function, \
.objects_options = { \
.gitmodules_found = OIDSET_INIT, \
--
2.45.2
