OSDN Git Service

Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2016 17:41:43 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2016 17:41:43 +0000 (10:41 -0700)
* 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

1  2 
builtin/pack-objects.c
builtin/rev-list.c
diff.h
git-compat-util.h
reachable.c
revision.c
tree-diff.c

Simple merge
Simple merge
diff --cc diff.h
Simple merge
Simple merge
diff --cc reachable.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc tree-diff.c
Simple merge