Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'

diff --git a/builtin/commit.c b/builtin/commit.c
index d9db59e1d275fbe0fac5c3ca461d8fdec3adcf2e..109742e2806c445584995e4fd7b6cf29323fef97 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -186,6 +186,7 @@ static void status_init_config(struct wt_status *s, config_fn_t fn)
        gitmodules_config();
        git_config(fn, s);
        determine_whence(s);
+       init_diff_ui_defaults();
        s->hints = advice_status_hints; /* must come after git_config() */
 }
 
@@ -761,7 +762,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                hook_arg2 = "";
        }
 
-       s->fp = fopen(git_path(commit_editmsg), "w");
+       s->fp = fopen_for_writing(git_path(commit_editmsg));
        if (s->fp == NULL)
                die_errno(_("could not open '%s'"), git_path(commit_editmsg));