summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-26 15:39:08 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-26 15:39:08 +0900
commitb80f629f5bcf798a3c9b37651d2369ad555e7382 (patch)
tree0a7ed758d7a74b96cb4bb713dbf66f9362a40b22 /builtin/merge-ours.c
parentMerge branch 'jh/add-index-entry-optim' (diff)
parentam: drop "dir" parameter from am_state_init (diff)
downloadtgif-b80f629f5bcf798a3c9b37651d2369ad555e7382.tar.xz
Merge branch 'jk/war-on-git-path'
While handy, "git_path()" is a dangerous function to use as a callsite that uses it safely one day can be broken by changes to other code that calls it. Reduction of its use continues. * jk/war-on-git-path: am: drop "dir" parameter from am_state_init replace strbuf_addstr(git_path()) with git_path_buf() replace xstrdup(git_path(...)) with git_pathdup(...) use git_path_* helper functions branch: add edit_description() helper bisect: add git_path_bisect_terms helper
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions