Skip to content

Commit

Permalink
fsck_handle_reflog_sha1(): new function
Browse files Browse the repository at this point in the history
New function, extracted from fsck_handle_reflog_ent(). The extra
is_null_sha1() test for the new reference is currently unnecessary, as
reflogs are deleted when the reference itself is deleted. But it
doesn't hurt, either.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Jun 8, 2015
1 parent 3d4a3ff commit d66ae59
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions builtin/fsck.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,28 +451,29 @@ static void fsck_dir(int i, char *path)

static int default_refs;

static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
const char *email, unsigned long timestamp, int tz,
const char *message, void *cb_data)
static void fsck_handle_reflog_sha1(unsigned char *sha1)
{
struct object *obj;

if (verbose)
fprintf(stderr, "Checking reflog %s->%s\n",
sha1_to_hex(osha1), sha1_to_hex(nsha1));

if (!is_null_sha1(osha1)) {
obj = lookup_object(osha1);
if (!is_null_sha1(sha1)) {
obj = lookup_object(sha1);
if (obj) {
obj->used = 1;
mark_object_reachable(obj);
}
}
obj = lookup_object(nsha1);
if (obj) {
obj->used = 1;
mark_object_reachable(obj);
}
}

static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
const char *email, unsigned long timestamp, int tz,
const char *message, void *cb_data)
{
if (verbose)
fprintf(stderr, "Checking reflog %s->%s\n",
sha1_to_hex(osha1), sha1_to_hex(nsha1));

fsck_handle_reflog_sha1(osha1);
fsck_handle_reflog_sha1(nsha1);
return 0;
}

Expand Down

0 comments on commit d66ae59

Please sign in to comment.