On Mon, 2007-11-26 at 09:59 +0100, Pierre Habouzit wrote:
> Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
> ---
>
> And here's the fix for this tiny problem …
That looks good to me.
Signed-off-by: Kristian Høgsberg <krh@xxxxxxxxxx>
>
>
> builtin-commit.c | 9 ++++++---
> builtin-tag.c | 6 +++---
> strbuf.h | 2 +-
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/builtin-commit.c b/builtin-commit.c
> index 5d27102..6e6b9f2 100644
> --- 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;
> - 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");
> }
> diff --git a/builtin-tag.c b/builtin-tag.c
> index e89b201..8cc7f9c 100644
> --- a/builtin-tag.c
> +++ b/builtin-tag.c
> @@ -23,7 +23,7 @@ static const char * const git_tag_usage[] = {
>
> 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;
>
> @@ -49,7 +49,7 @@ void launch_editor(const char *path, struct strbuf *buffer)
> 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);
> }
>
> @@ -318,7 +318,7 @@ static void create_tag(const unsigned char *object, const char *tag,
> write_or_die(fd, tag_template, strlen(tag_template));
> close(fd);
>
> - launch_editor(path, buf);
> + launch_editor(path, buf, NULL);
>
> unlink(path);
> free(path);
> diff --git a/strbuf.h b/strbuf.h
> index 8334a9b..36d61db 100644
> --- 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 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 */
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
