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

fsck_handle_reflog_sha1(): new function

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2015-06-08 15:40:04 +02:00 committed by Junio C Hamano
parent 3d4a3ffe64
commit d66ae59b8a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/fsck.c
View File

@ -451,28 +451,29 @@ static void fsck_dir(int i, char *path)
static int default_refs; static int default_refs;
static void fsck_handle_reflog_sha1(unsigned char *sha1)
{
struct object *obj;
if (!is_null_sha1(sha1)) {
obj = lookup_object(sha1);
if (obj) {
obj->used = 1;
mark_object_reachable(obj);
}
}
}
static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1, static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
const char *email, unsigned long timestamp, int tz, const char *email, unsigned long timestamp, int tz,
const char *message, void *cb_data) const char *message, void *cb_data)
{ {
struct object *obj;
if (verbose) if (verbose)
fprintf(stderr, "Checking reflog %s->%s\n", fprintf(stderr, "Checking reflog %s->%s\n",
sha1_to_hex(osha1), sha1_to_hex(nsha1)); sha1_to_hex(osha1), sha1_to_hex(nsha1));
if (!is_null_sha1(osha1)) { fsck_handle_reflog_sha1(osha1);
obj = lookup_object(osha1); fsck_handle_reflog_sha1(nsha1);
if (obj) {
obj->used = 1;
mark_object_reachable(obj);
}
}
obj = lookup_object(nsha1);
if (obj) {
obj->used = 1;
mark_object_reachable(obj);
}
return 0; return 0;
} }