[PATCH 2/6] branch: add edit_description() helper
- From
Jeff King <peff@peff.net>
- Date
- Apr 20, 2017, 21:08 UTC
- Message-ID
- <20170420210840.hufdbroebp2dpcsz@sigill.intra.peff.net>
- In-Reply-To
- <20170420210754.bzrnc74dpjs7fgpf@sigill.intra.peff.net>
Rather than have a variable with a short name that is fed to git_path(), let's add a helper function that returns the full path. This avoids the dangerous git_path() function.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/branch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c index 0552c42ad..48a513a84 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -504,7 +504,7 @@ static void rename_branch(const char *oldname, const char *newname, int force) strbuf_release(&newsection); } -static const char edit_description[] = "BRANCH_DESCRIPTION"; +static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION") static int edit_branch_description(const char *branch_name) { @@ -519,9 +519,9 @@ static int edit_branch_description(const char *branch_name) " %s\n" "Lines starting with '%c' will be stripped.\n"), branch_name, comment_line_char); - write_file_buf(git_path(edit_description), buf.buf, buf.len); + write_file_buf(edit_description(), buf.buf, buf.len); strbuf_reset(&buf); - if (launch_editor(git_path(edit_description), &buf, NULL)) { + if (launch_editor(edit_description(), &buf, NULL)) { strbuf_release(&buf); return -1; }
-- 2.13.0.rc0.363.g8726c260e