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 /builtin/merge-tree.c | |
| parent | Git 2.5.4 (diff) | |
| parent | list-objects: pass full pathname to callbacks (diff) | |
| download | tgif-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 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions