tree 6ea3d887f7cff3c48eb694b9535da0a919b218bd
parent 833e48259e23aea76f3765d28d1b2200332301f7
parent e568e563ade00bbb0937162f405fc160f253e224
author Junio C Hamano <gitster@pobox.com> 1458239178 -0700
committer Junio C Hamano <gitster@pobox.com> 1458239178 -0700

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