diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-16 10:42:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-16 10:42:32 -0700 |
| commit | 55c45a732582ca74d9f8a73c8f176d3dadd5b819 (patch) | |
| tree | 915cb72714cc5fb380382b27cd6da2861b4d71f2 /reachable.c | |
| parent | 594730e980521310d88006d91f3f14ef5eff1e2b (diff) | |
| parent | 717e3551b9fbfdb72e40a81fc0fb714cdaadb37f (diff) | |
| download | git-jk/path-name-safety-2.7.tar.gz | |
Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7
* jk/path-name-safety-2.6:
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 43616d49c7..ed35201896 100644 --- a/reachable.c +++ b/reachable.c @@ -43,15 +43,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 { |