[PATCH 1/6] bisect: add git_path_bisect_terms helper
- From
Jeff King <peff@peff.net>
- Date
- Apr 20, 2017, 21:08 UTC
- Message-ID
- <20170420210825.lr55sl7se4uloncf@sigill.intra.peff.net>
- In-Reply-To
- <20170420210754.bzrnc74dpjs7fgpf@sigill.intra.peff.net>
This avoids using the dangerous git_path(). Right now there's only one call site (because the writing half is still part of the shell script), but it may come in handy in the future as more of bisect is written in C. It also matches how we access the other BISECT_* files.
Signed-off-by: Jeff King <peff@peff.net> --- bisect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bisect.c b/bisect.c index 03af06c66..08c9fb726 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) {
-- 2.13.0.rc0.363.g8726c260e