diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:26:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:26:18 -0700 |
| commit | ce4d4e763c054788550625502553ced8810a7bce (patch) | |
| tree | 6ea3d887f7cff3c48eb694b9535da0a919b218bd /builtin/pull.c | |
| parent | Git 2.6.5 (diff) | |
| parent | Git 2.5.5 (diff) | |
| download | tgif-ce4d4e763c054788550625502553ced8810a7bce.tar.xz | |
Merge branch 'maint-2.5' into maint-2.6
* maint-2.5:
Git 2.5.5
Git 2.4.11
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/pull.c')
0 files changed, 0 insertions, 0 deletions