summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-16 10:42:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-16 10:42:32 -0700
commit55c45a732582ca74d9f8a73c8f176d3dadd5b819 (patch)
tree915cb72714cc5fb380382b27cd6da2861b4d71f2 /ll-merge.c
parentGit 2.7.3 (diff)
parentMerge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6 (diff)
downloadtgif-55c45a732582ca74d9f8a73c8f176d3dadd5b819.tar.xz
Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7
* jk/path-name-safety-2.6: 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 'll-merge.c')
0 files changed, 0 insertions, 0 deletions