summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-26 15:39:08 +0900
committerJunio C Hamano <gitster@pobox.com>2017-04-26 15:39:08 +0900
commitb80f629f5bcf798a3c9b37651d2369ad555e7382 (patch)
tree0a7ed758d7a74b96cb4bb713dbf66f9362a40b22 /bisect.c
parent6cbc478d83b5773d1925869e50bf6067306f4817 (diff)
parent16d2676c9ee996208277772fdf81dda212355440 (diff)
downloadgit-b80f629f5bcf798a3c9b37651d2369ad555e7382.tar.gz
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 'bisect.c')
-rw-r--r--bisect.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/bisect.c b/bisect.c
index 03af06c66c..08c9fb7266 100644
--- a/bisect.c
+++ b/bisect.c
@@ -432,6 +432,7 @@ static int read_bisect_refs(void)
static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
+static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
static void read_bisect_paths(struct argv_array *array)
{
@@ -906,7 +907,7 @@ static void show_diff_tree(const char *prefix, struct commit *commit)
void read_bisect_terms(const char **read_bad, const char **read_good)
{
struct strbuf str = STRBUF_INIT;
- const char *filename = git_path("BISECT_TERMS");
+ const char *filename = git_path_bisect_terms();
FILE *fp = fopen(filename, "r");
if (!fp) {