mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jt/fsck-code-cleanup'
Code clean-up. * jt/fsck-code-cleanup: fsck: cleanup unused variable object: remove "used" field from struct object fsck: remove redundant parse_tree() invocation
This commit is contained in:
commit
2c40c6a77f
|
@ -19,6 +19,8 @@
|
||||||
#define REACHABLE 0x0001
|
#define REACHABLE 0x0001
|
||||||
#define SEEN 0x0002
|
#define SEEN 0x0002
|
||||||
#define HAS_OBJ 0x0004
|
#define HAS_OBJ 0x0004
|
||||||
|
/* This flag is set if something points to this object. */
|
||||||
|
#define USED 0x0008
|
||||||
|
|
||||||
static int show_root;
|
static int show_root;
|
||||||
static int show_tags;
|
static int show_tags;
|
||||||
|
@ -168,18 +170,7 @@ static void mark_object_reachable(struct object *obj)
|
||||||
|
|
||||||
static int traverse_one_object(struct object *obj)
|
static int traverse_one_object(struct object *obj)
|
||||||
{
|
{
|
||||||
int result;
|
return fsck_walk(obj, obj, &fsck_walk_options);
|
||||||
struct tree *tree = NULL;
|
|
||||||
|
|
||||||
if (obj->type == OBJ_TREE) {
|
|
||||||
tree = (struct tree *)obj;
|
|
||||||
if (parse_tree(tree) < 0)
|
|
||||||
return 1; /* error already displayed */
|
|
||||||
}
|
|
||||||
result = fsck_walk(obj, obj, &fsck_walk_options);
|
|
||||||
if (tree)
|
|
||||||
free_tree_buffer(tree);
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int traverse_reachable(void)
|
static int traverse_reachable(void)
|
||||||
|
@ -206,7 +197,7 @@ static int mark_used(struct object *obj, int type, void *data, struct fsck_optio
|
||||||
{
|
{
|
||||||
if (!obj)
|
if (!obj)
|
||||||
return 1;
|
return 1;
|
||||||
obj->used = 1;
|
obj->flags |= USED;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -255,7 +246,7 @@ static void check_unreachable_object(struct object *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "!used" means that nothing at all points to it, including
|
* "!USED" means that nothing at all points to it, including
|
||||||
* other unreachable objects. In other words, it's the "tip"
|
* other unreachable objects. In other words, it's the "tip"
|
||||||
* of some set of unreachable objects, usually a commit that
|
* of some set of unreachable objects, usually a commit that
|
||||||
* got dropped.
|
* got dropped.
|
||||||
|
@ -266,7 +257,7 @@ static void check_unreachable_object(struct object *obj)
|
||||||
* deleted a branch by mistake, this is a prime candidate to
|
* deleted a branch by mistake, this is a prime candidate to
|
||||||
* start looking at, for example.
|
* start looking at, for example.
|
||||||
*/
|
*/
|
||||||
if (!obj->used) {
|
if (!(obj->flags & USED)) {
|
||||||
if (show_dangling)
|
if (show_dangling)
|
||||||
printf("dangling %s %s\n", printable_type(obj),
|
printf("dangling %s %s\n", printable_type(obj),
|
||||||
describe_object(obj));
|
describe_object(obj));
|
||||||
|
@ -390,7 +381,8 @@ static int fsck_obj_buffer(const struct object_id *oid, enum object_type type,
|
||||||
errors_found |= ERROR_OBJECT;
|
errors_found |= ERROR_OBJECT;
|
||||||
return error("%s: object corrupt or missing", oid_to_hex(oid));
|
return error("%s: object corrupt or missing", oid_to_hex(oid));
|
||||||
}
|
}
|
||||||
obj->flags = HAS_OBJ;
|
obj->flags &= ~(REACHABLE | SEEN);
|
||||||
|
obj->flags |= HAS_OBJ;
|
||||||
return fsck_obj(obj);
|
return fsck_obj(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -408,7 +400,7 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
|
||||||
add_decoration(fsck_walk_options.object_names,
|
add_decoration(fsck_walk_options.object_names,
|
||||||
obj,
|
obj,
|
||||||
xstrfmt("%s@{%"PRItime"}", refname, timestamp));
|
xstrfmt("%s@{%"PRItime"}", refname, timestamp));
|
||||||
obj->used = 1;
|
obj->flags |= USED;
|
||||||
mark_object_reachable(obj);
|
mark_object_reachable(obj);
|
||||||
} else {
|
} else {
|
||||||
error("%s: invalid reflog entry %s", refname, oid_to_hex(oid));
|
error("%s: invalid reflog entry %s", refname, oid_to_hex(oid));
|
||||||
|
@ -456,7 +448,7 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
|
||||||
errors_found |= ERROR_REFS;
|
errors_found |= ERROR_REFS;
|
||||||
}
|
}
|
||||||
default_refs++;
|
default_refs++;
|
||||||
obj->used = 1;
|
obj->flags |= USED;
|
||||||
if (name_objects)
|
if (name_objects)
|
||||||
add_decoration(fsck_walk_options.object_names,
|
add_decoration(fsck_walk_options.object_names,
|
||||||
obj, xstrdup(refname));
|
obj, xstrdup(refname));
|
||||||
|
@ -524,7 +516,8 @@ static int fsck_loose(const struct object_id *oid, const char *path, void *data)
|
||||||
return 0; /* keep checking other objects */
|
return 0; /* keep checking other objects */
|
||||||
}
|
}
|
||||||
|
|
||||||
obj->flags = HAS_OBJ;
|
obj->flags &= ~(REACHABLE | SEEN);
|
||||||
|
obj->flags |= HAS_OBJ;
|
||||||
if (fsck_obj(obj))
|
if (fsck_obj(obj))
|
||||||
errors_found |= ERROR_OBJECT;
|
errors_found |= ERROR_OBJECT;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -606,7 +599,7 @@ static int fsck_cache_tree(struct cache_tree *it)
|
||||||
errors_found |= ERROR_REFS;
|
errors_found |= ERROR_REFS;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
obj->used = 1;
|
obj->flags |= USED;
|
||||||
if (name_objects)
|
if (name_objects)
|
||||||
add_decoration(fsck_walk_options.object_names,
|
add_decoration(fsck_walk_options.object_names,
|
||||||
obj, xstrdup(":"));
|
obj, xstrdup(":"));
|
||||||
|
@ -667,7 +660,7 @@ static struct option fsck_opts[] = {
|
||||||
|
|
||||||
int cmd_fsck(int argc, const char **argv, const char *prefix)
|
int cmd_fsck(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
int i, heads;
|
int i;
|
||||||
struct alternate_object_database *alt;
|
struct alternate_object_database *alt;
|
||||||
|
|
||||||
errors_found = 0;
|
errors_found = 0;
|
||||||
|
@ -735,7 +728,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
heads = 0;
|
|
||||||
for (i = 0; i < argc; i++) {
|
for (i = 0; i < argc; i++) {
|
||||||
const char *arg = argv[i];
|
const char *arg = argv[i];
|
||||||
struct object_id oid;
|
struct object_id oid;
|
||||||
|
@ -748,12 +740,11 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
obj->used = 1;
|
obj->flags |= USED;
|
||||||
if (name_objects)
|
if (name_objects)
|
||||||
add_decoration(fsck_walk_options.object_names,
|
add_decoration(fsck_walk_options.object_names,
|
||||||
obj, xstrdup(arg));
|
obj, xstrdup(arg));
|
||||||
mark_object_reachable(obj);
|
mark_object_reachable(obj);
|
||||||
heads++;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
error("invalid parameter: expected sha1, got '%s'", arg);
|
error("invalid parameter: expected sha1, got '%s'", arg);
|
||||||
|
@ -785,7 +776,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
||||||
if (!blob)
|
if (!blob)
|
||||||
continue;
|
continue;
|
||||||
obj = &blob->object;
|
obj = &blob->object;
|
||||||
obj->used = 1;
|
obj->flags |= USED;
|
||||||
if (name_objects)
|
if (name_objects)
|
||||||
add_decoration(fsck_walk_options.object_names,
|
add_decoration(fsck_walk_options.object_names,
|
||||||
obj,
|
obj,
|
||||||
|
|
1
object.c
1
object.c
|
@ -141,7 +141,6 @@ void *create_object(const unsigned char *sha1, void *o)
|
||||||
struct object *obj = o;
|
struct object *obj = o;
|
||||||
|
|
||||||
obj->parsed = 0;
|
obj->parsed = 0;
|
||||||
obj->used = 0;
|
|
||||||
obj->flags = 0;
|
obj->flags = 0;
|
||||||
hashcpy(obj->oid.hash, sha1);
|
hashcpy(obj->oid.hash, sha1);
|
||||||
|
|
||||||
|
|
2
object.h
2
object.h
|
@ -38,6 +38,7 @@ struct object_array {
|
||||||
* http-push.c: 16-----19
|
* http-push.c: 16-----19
|
||||||
* commit.c: 16-----19
|
* commit.c: 16-----19
|
||||||
* sha1_name.c: 20
|
* sha1_name.c: 20
|
||||||
|
* builtin/fsck.c: 0--3
|
||||||
*/
|
*/
|
||||||
#define FLAG_BITS 27
|
#define FLAG_BITS 27
|
||||||
|
|
||||||
|
@ -46,7 +47,6 @@ struct object_array {
|
||||||
*/
|
*/
|
||||||
struct object {
|
struct object {
|
||||||
unsigned parsed : 1;
|
unsigned parsed : 1;
|
||||||
unsigned used : 1;
|
|
||||||
unsigned type : TYPE_BITS;
|
unsigned type : TYPE_BITS;
|
||||||
unsigned flags : FLAG_BITS;
|
unsigned flags : FLAG_BITS;
|
||||||
struct object_id oid;
|
struct object_id oid;
|
||||||
|
|
Loading…
Reference in a new issue