builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well.

The editor program to let the user edit the log message used to
get GIT_INDEX_FILE environment variable pointing at the right
file, but this was lost when git-commit was rewritten in C.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Acked-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-commit.c b/builtin-commit.c
index 4de316a366d1ee7201d89b776a4a9a4b499d32b8..f60bd7f4dce5848ae4993753e01f88de98b391da 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -748,9 +748,12 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
        /* Get the commit message and validate it */
        header_len = sb.len;
 
        /* Get the commit message and validate it */
        header_len = sb.len;

-       if (!no_edit)
-               launch_editor(git_path(commit_editmsg), &sb);
-       else if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
+       if (!no_edit) {
+               char index[PATH_MAX];
+               const char *env[2] = { index, NULL };
+               snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
+               launch_editor(git_path(commit_editmsg), &sb, env);
+       } else if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {

                rollback_index_files();
                die("could not read commit message\n");
        }
                rollback_index_files();
                die("could not read commit message\n");
        }

diff --git a/builtin-tag.c b/builtin-tag.c
index 566b9d186fb8a20841cce23914643556c6c24382..7626da3f47fad011733b9cc9a87a2e88778e1100 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -17,7 +17,7 @@ static const char builtin_tag_usage[] =
 
 static char signingkey[1000];
 
 
 static char signingkey[1000];
 

-void launch_editor(const char *path, struct strbuf *buffer)
+void launch_editor(const char *path, struct strbuf *buffer, const char *const *env)

 {
        const char *editor, *terminal;
 
 {
        const char *editor, *terminal;
 


@@ -43,7 +43,7 @@ void launch_editor(const char *path, struct strbuf *buffer)
        if (strcmp(editor, ":")) {
                const char *args[] = { editor, path, NULL };
 
        if (strcmp(editor, ":")) {
                const char *args[] = { editor, path, NULL };
 

-               if (run_command_v_opt(args, 0))
+               if (run_command_v_opt_cd_env(args, 0, NULL, env))

                        die("There was a problem with the editor %s.", editor);
        }
 
                        die("There was a problem with the editor %s.", editor);
        }
 


@@ -312,7 +312,7 @@ static void create_tag(const unsigned char *object, const char *tag,
                        write_or_die(fd, tag_template, strlen(tag_template));
                close(fd);
 
                        write_or_die(fd, tag_template, strlen(tag_template));
                close(fd);
 

-               launch_editor(path, buf);
+               launch_editor(path, buf, NULL);

 
                unlink(path);
                free(path);
 
                unlink(path);
                free(path);

diff --git a/strbuf.h b/strbuf.h
index 8334a9bad00ddf3e66c18c37020f9ab08691cffa..36d61db65728f61188ef3bedbdbe88d0f2d9a0b9 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -117,6 +117,6 @@ extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
 extern void stripspace(struct strbuf *buf, int skip_comments);
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
 extern void stripspace(struct strbuf *buf, int skip_comments);

-extern void launch_editor(const char *path, struct strbuf *buffer);
+extern void launch_editor(const char *path, struct strbuf *buffer, const char *const *env);

 
 #endif /* STRBUF_H */
 
 #endif /* STRBUF_H */