OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_entry: fix leak when retrying delayed filter
[git-core/git.git]
/
reachable.c
diff --git
a/reachable.c
b/reachable.c
index
a8a979b
..
c62efbf
100644
(file)
--- a/
reachable.c
+++ b/
reachable.c
@@
-33,7
+33,7
@@
static int add_one_ref(const char *path, const struct object_id *oid,
return 0;
}
return 0;
}
- object = parse_object_or_die(oid
->hash
, path);
+ object = parse_object_or_die(oid, path);
add_pending_object(revs, object, "");
return 0;
add_pending_object(revs, object, "");
return 0;
@@
-55,11
+55,11
@@
static void mark_commit(struct commit *c, void *data)
struct recent_data {
struct rev_info *revs;
struct recent_data {
struct rev_info *revs;
-
unsigned long
timestamp;
+
timestamp_t
timestamp;
};
static void add_recent_object(const struct object_id *oid,
};
static void add_recent_object(const struct object_id *oid,
-
unsigned long
mtime,
+
timestamp_t
mtime,
struct recent_data *data)
{
struct object *obj;
struct recent_data *data)
{
struct object *obj;
@@
-82,13
+82,13
@@
static void add_recent_object(const struct object_id *oid,
switch (type) {
case OBJ_TAG:
case OBJ_COMMIT:
switch (type) {
case OBJ_TAG:
case OBJ_COMMIT:
- obj = parse_object_or_die(oid
->hash
, NULL);
+ obj = parse_object_or_die(oid, NULL);
break;
case OBJ_TREE:
break;
case OBJ_TREE:
- obj = (struct object *)lookup_tree(oid
->hash
);
+ obj = (struct object *)lookup_tree(oid);
break;
case OBJ_BLOB:
break;
case OBJ_BLOB:
- obj = (struct object *)lookup_blob(oid
->hash
);
+ obj = (struct object *)lookup_blob(oid);
break;
default:
die("unknown object type for %s: %s",
break;
default:
die("unknown object type for %s: %s",
@@
-139,7
+139,7
@@
static int add_recent_packed(const struct object_id *oid,
}
int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
}
int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
-
unsigned long
timestamp)
+
timestamp_t
timestamp)
{
struct recent_data data;
int r;
{
struct recent_data data;
int r;
@@
-156,8
+156,7
@@
int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
}
void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
}
void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
- unsigned long mark_recent,
- struct progress *progress)
+ timestamp_t mark_recent, struct progress *progress)
{
struct connectivity_progress cp;
{
struct connectivity_progress cp;