diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-16 10:41:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-16 10:41:43 -0700 |
| commit | 253ce7a15c251057464b130016c74cbe10fe9e57 (patch) | |
| tree | a9a5b9cef3509f2d2dd4a60c8eb3f9e3819a3a56 /list-objects.h | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| parent | 2824e1841b99393d2469c495253d547c643bd8f1 (diff) | |
| download | git-253ce7a15c251057464b130016c74cbe10fe9e57.tar.gz git-253ce7a15c251057464b130016c74cbe10fe9e57.tar.xz | |
Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5
* jk/path-name-safety-2.4:
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 'list-objects.h')
| -rw-r--r-- | list-objects.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.h b/list-objects.h index 136a1da5a..0cebf8585 100644 --- a/list-objects.h +++ b/list-objects.h @@ -2,7 +2,7 @@ #define LIST_OBJECTS_H typedef void (*show_commit_fn)(struct commit *, void *); -typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *); +typedef void (*show_object_fn)(struct object *, const char *, void *); void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); typedef void (*show_edge_fn)(struct commit *); |