diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-06-22 17:27:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-23 14:27:37 -0700 |
| commit | 02976bf856bc47ea2bcb9423cd13b6f69ce58929 (patch) | |
| tree | fa1efe6204a7ac1055211214f169f17f589f3b9c /builtin/fsck.c | |
| parent | 2becf00ff70b324999d0e3046d828a80884ab561 (diff) | |
| download | git-02976bf856bc47ea2bcb9423cd13b6f69ce58929.tar.gz git-02976bf856bc47ea2bcb9423cd13b6f69ce58929.tar.xz | |
fsck: introduce `git fsck --connectivity-only`
This option avoids unpacking each and all blob objects, and just
verifies the connectivity. In particular with large repositories, this
speeds up the operation, at the expense of missing corrupt blobs,
ignoring unreachable objects and other fsck issues, if any.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fsck.c')
| -rw-r--r-- | builtin/fsck.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 6dc2f9487..070909ef2 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -23,6 +23,7 @@ static int show_tags; static int show_unreachable; static int include_reflogs = 1; static int check_full = 1; +static int connectivity_only; static int check_strict; static int keep_cache_objects; static struct fsck_options fsck_walk_options = FSCK_OPTIONS_DEFAULT; @@ -181,6 +182,8 @@ static void check_reachable_object(struct object *obj) if (!(obj->flags & HAS_OBJ)) { if (has_sha1_pack(obj->sha1)) return; /* it is in pack - forget about it */ + if (connectivity_only && has_sha1_file(obj->sha1)) + return; printf("missing %s %s\n", typename(obj->type), sha1_to_hex(obj->sha1)); errors_found |= ERROR_REACHABLE; return; @@ -617,6 +620,7 @@ static struct option fsck_opts[] = { OPT_BOOL(0, "cache", &keep_cache_objects, N_("make index objects head nodes")), OPT_BOOL(0, "reflogs", &include_reflogs, N_("make reflogs head nodes (default)")), OPT_BOOL(0, "full", &check_full, N_("also consider packs and alternate objects")), + OPT_BOOL(0, "connectivity-only", &connectivity_only, N_("check only connectivity")), OPT_BOOL(0, "strict", &check_strict, N_("enable more strict checking")), OPT_BOOL(0, "lost-found", &write_lost_and_found, N_("write dangling objects in .git/lost-found")), @@ -653,7 +657,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) git_config(fsck_config, NULL); fsck_head_link(); - fsck_object_dir(get_object_directory()); + if (!connectivity_only) + fsck_object_dir(get_object_directory()); prepare_alt_odb(); for (alt = alt_odb_list; alt; alt = alt->next) { |