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 /builtin/rev-list.c | |
| parent | 594730e980521310d88006d91f3f14ef5eff1e2b (diff) | |
| parent | 717e3551b9fbfdb72e40a81fc0fb714cdaadb37f (diff) | |
| download | git-55c45a732582ca74d9f8a73c8f176d3dadd5b819.tar.gz git-55c45a732582ca74d9f8a73c8f176d3dadd5b819.tar.xz | |
Merge branch 'jk/path-name-safety-2.6' into jk/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 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 3aa89a1a3..275da0d64 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -177,9 +177,7 @@ static void finish_commit(struct commit *commit, void *data) free_commit_buffer(commit); } -static void finish_object(struct object *obj, - const struct name_path *path, const char *name, - void *cb_data) +static void finish_object(struct object *obj, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; if (obj->type == OBJ_BLOB && !has_object_file(&obj->oid)) @@ -188,15 +186,13 @@ static void finish_object(struct object *obj, parse_object(obj->oid.hash); } -static void show_object(struct object *obj, - const struct name_path *path, const char *component, - void *cb_data) +static void show_object(struct object *obj, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; - finish_object(obj, path, component, cb_data); + finish_object(obj, name, cb_data); if (info->flags & REV_LIST_QUIET) return; - show_object_with_name(stdout, obj, path, component); + show_object_with_name(stdout, obj, name); } static void show_edge(struct commit *commit) |