After the discussion about the git_path()-related bug in: http://public-inbox.org/git/20170329080820.8084-1-chriscool@xxxxxxxxxxxxx/ I looked over some of the calls. When I introduced git_pathdup() a few years ago I converted most of the dangerous git_path() calls. But there were still some left, and of course new ones have been added. This patch cleans up some of the low-hanging fruit. There's probably more that could be done, but this is just what I happened to produce when looking through some of the cases the other day. I don't think any of these is fixing a triggerable bug; they can all be considered cleanup. [1/6]: bisect: add git_path_bisect_terms helper [2/6]: branch: add edit_description() helper [3/6]: use git_path_* helper functions [4/6]: replace xstrdup(git_path(...)) with git_pathdup(...) [5/6]: replace strbuf_addstr(git_path()) with git_path_buf() [6/6]: am: drop "dir" parameter from am_state_init bisect.c | 3 ++- builtin/am.c | 10 ++++------ builtin/branch.c | 6 +++--- builtin/commit.c | 6 +++--- builtin/config.c | 5 +++-- builtin/pull.c | 4 ++-- builtin/worktree.c | 6 ++---- fast-import.c | 2 +- notes-merge.c | 4 ++-- sequencer.c | 12 ++++++------ 10 files changed, 28 insertions(+), 30 deletions(-)