diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-16 17:42:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-16 17:42:32 (GMT) |
| commit | 55c45a732582ca74d9f8a73c8f176d3dadd5b819 (patch) | |
| tree | 915cb72714cc5fb380382b27cd6da2861b4d71f2 /builtin | |
| parent | 594730e980521310d88006d91f3f14ef5eff1e2b (diff) | |
| parent | 717e3551b9fbfdb72e40a81fc0fb714cdaadb37f (diff) | |
| download | git-55c45a732582ca74d9f8a73c8f176d3dadd5b819.zip git-55c45a732582ca74d9f8a73c8f176d3dadd5b819.tar.gz git-55c45a732582ca74d9f8a73c8f176d3dadd5b819.tar.bz2 | |
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')
| -rw-r--r-- | builtin/pack-objects.c | 15 | ||||
| -rw-r--r-- | builtin/rev-list.c | 12 |
2 files changed, 6 insertions, 21 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index b4f1fa6..a27de5b 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2285,21 +2285,11 @@ static void show_commit(struct commit *commit, void *data) index_commit_for_bitmap(commit); } -static void show_object(struct object *obj, - const struct name_path *path, const char *last, - void *data) +static void show_object(struct object *obj, const char *name, void *data) { - char *name = path_name(path, last); - add_preferred_base_object(name); add_object_entry(obj->oid.hash, obj->type, name, 0); obj->flags |= OBJECT_ADDED; - - /* - * We will have generated the hash from the name, - * but not saved a pointer to it - we can free it - */ - free((char *)name); } static void show_edge(struct commit *commit) @@ -2481,8 +2471,7 @@ static int get_object_list_from_bitmap(struct rev_info *revs) } static void record_recent_object(struct object *obj, - const struct name_path *path, - const char *last, + const char *name, void *data) { sha1_array_append(&recent_objects, obj->oid.hash); diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 3aa89a1..275da0d 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) |