branch: add edit_description() helper

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index babfd0f73063060eea595fccabefe55f9f631d26..c55ea58040284243bec41bb4a41227cf66fe0084 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -600,7 +600,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
        strbuf_release(&newsection);
 }
 
        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)
 {
 
 static int edit_branch_description(const char *branch_name)
 {


@@ -615,9 +615,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);
                      "  %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);
        strbuf_reset(&buf);

-       if (launch_editor(git_path(edit_description), &buf, NULL)) {
+       if (launch_editor(edit_description(), &buf, NULL)) {

                strbuf_release(&buf);
                return -1;
        }
                strbuf_release(&buf);
                return -1;
        }