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 /revision.h | |
| 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 'revision.h')
| -rw-r--r-- | revision.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/revision.h b/revision.h index 23857c0ed1..dca0d38171 100644 --- a/revision.h +++ b/revision.h @@ -257,16 +257,9 @@ extern void put_revision_mark(const struct rev_info *revs, extern void mark_parents_uninteresting(struct commit *commit); extern void mark_tree_uninteresting(struct tree *tree); -struct name_path { - struct name_path *up; - int elem_len; - const char *elem; -}; - -char *path_name(const struct name_path *path, const char *name); +char *path_name(struct strbuf *path, const char *name); -extern void show_object_with_name(FILE *, struct object *, - const struct name_path *, const char *); +extern void show_object_with_name(FILE *, struct object *, const char *); extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name); |