undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck: move fsck_head_link() to get_default_heads() to avoid some globals

Browse Source 
This will make it easier to check the HEAD of other worktrees from fsck.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-10-21 10:08:57 +02:00 committed by Junio C Hamano
parent ab3e1f78ae
commit a8c754d4e2
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin/fsck.c
View File

@ -36,8 +36,6 @@ static int check_strict;
static int keep_cache_objects; static int keep_cache_objects;
static struct fsck_options fsck_walk_options = FSCK_OPTIONS_DEFAULT; static struct fsck_options fsck_walk_options = FSCK_OPTIONS_DEFAULT;
static struct fsck_options fsck_obj_options = FSCK_OPTIONS_DEFAULT; static struct fsck_options fsck_obj_options = FSCK_OPTIONS_DEFAULT;
static struct object_id head_oid;
static const char *head_points_at;
static int errors_found; static int errors_found;
static int write_lost_and_found; static int write_lost_and_found;
static int verbose; static int verbose;
@ -484,8 +482,15 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
return 0; return 0;
} }
static int fsck_head_link(const char **head_points_at,
struct object_id *head_oid);
static void get_default_heads(void) static void get_default_heads(void)
{ {
const char *head_points_at;
struct object_id head_oid;
fsck_head_link(&head_points_at, &head_oid);
if (head_points_at && !is_null_oid(&head_oid)) if (head_points_at && !is_null_oid(&head_oid))
fsck_handle_ref("HEAD", &head_oid, 0, NULL); fsck_handle_ref("HEAD", &head_oid, 0, NULL);
for_each_rawref(fsck_handle_ref, NULL); for_each_rawref(fsck_handle_ref, NULL);
@ -579,33 +584,34 @@ static void fsck_object_dir(const char *path)
stop_progress(&progress); stop_progress(&progress);
} }
static int fsck_head_link(void) static int fsck_head_link(const char **head_points_at,
struct object_id *head_oid)
{ {
int null_is_error = 0; int null_is_error = 0;
if (verbose) if (verbose)
fprintf(stderr, "Checking HEAD link\n"); fprintf(stderr, "Checking HEAD link\n");
head_points_at = resolve_ref_unsafe("HEAD", 0, &head_oid, NULL); *head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid, NULL);
if (!head_points_at) { if (!*head_points_at) {
errors_found |= ERROR_REFS; errors_found |= ERROR_REFS;
return error("Invalid HEAD"); return error("Invalid HEAD");
} }
if (!strcmp(head_points_at, "HEAD")) if (!strcmp(*head_points_at, "HEAD"))
/* detached HEAD */ /* detached HEAD */
null_is_error = 1; null_is_error = 1;
else if (!starts_with(head_points_at, "refs/heads/")) { else if (!starts_with(*head_points_at, "refs/heads/")) {
errors_found |= ERROR_REFS; errors_found |= ERROR_REFS;
return error("HEAD points to something strange (%s)", return error("HEAD points to something strange (%s)",
head_points_at); *head_points_at);
} }
if (is_null_oid(&head_oid)) { if (is_null_oid(head_oid)) {
if (null_is_error) { if (null_is_error) {
errors_found |= ERROR_REFS; errors_found |= ERROR_REFS;
return error("HEAD: detached HEAD points at nothing"); return error("HEAD: detached HEAD points at nothing");
} }
fprintf(stderr, "notice: HEAD points to an unborn branch (%s)\n", fprintf(stderr, "notice: HEAD points to an unborn branch (%s)\n",
head_points_at + 11); *head_points_at + 11);
} }
return 0; return 0;
} }
@ -720,7 +726,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
git_config(fsck_config, NULL); git_config(fsck_config, NULL);
fsck_head_link();
if (connectivity_only) { if (connectivity_only) {
for_each_loose_object(mark_loose_for_connectivity, NULL, 0); for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
for_each_packed_object(mark_packed_for_connectivity, NULL, 0); for_each_packed_object(mark_packed_for_connectivity, NULL, 0);