diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:14 -0700 |
| commit | c638f3e4d585008f630d7dd8bb902f44217455b3 (patch) | |
| tree | 1772afa44a4b0878c94824762684866b24a12ee1 /reachable.c | |
| parent | Git 2.5.4 (diff) | |
| parent | Git 2.4.11 (diff) | |
| download | tgif-c638f3e4d585008f630d7dd8bb902f44217455b3.tar.xz | |
Merge branch 'maint-2.4' into maint-2.5
* maint-2.4:
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Diffstat (limited to 'reachable.c')
| -rw-r--r-- | reachable.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/reachable.c b/reachable.c index 9cff25b490..59196253a6 100644 --- a/reachable.c +++ b/reachable.c @@ -37,15 +37,14 @@ static int add_one_ref(const char *path, const struct object_id *oid, * The traversal will have already marked us as SEEN, so we * only need to handle any progress reporting here. */ -static void mark_object(struct object *obj, const struct name_path *path, - const char *name, void *data) +static void mark_object(struct object *obj, const char *name, void *data) { update_progress(data); } static void mark_commit(struct commit *c, void *data) { - mark_object(&c->object, NULL, NULL, data); + mark_object(&c->object, NULL, data); } struct recent_data { |