mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'pb/commit-editmsg-path'
Code clean-up. * pb/commit-editmsg-path: builtin/commit.c: memoize git-path for COMMIT_EDITMSG
This commit is contained in:
commit
7758b02b44
|
@ -92,8 +92,9 @@ N_("If you wish to skip this commit, use:\n"
|
||||||
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
|
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
|
||||||
"the remaining commits.\n");
|
"the remaining commits.\n");
|
||||||
|
|
||||||
|
static GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG")
|
||||||
|
|
||||||
static const char *use_message_buffer;
|
static const char *use_message_buffer;
|
||||||
static const char commit_editmsg[] = "COMMIT_EDITMSG";
|
|
||||||
static struct lock_file index_lock; /* real index */
|
static struct lock_file index_lock; /* real index */
|
||||||
static struct lock_file false_lock; /* used only for partial commits */
|
static struct lock_file false_lock; /* used only for partial commits */
|
||||||
static enum {
|
static enum {
|
||||||
|
@ -772,9 +773,9 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||||
hook_arg2 = "";
|
hook_arg2 = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
s->fp = fopen_for_writing(git_path(commit_editmsg));
|
s->fp = fopen_for_writing(git_path_commit_editmsg());
|
||||||
if (s->fp == NULL)
|
if (s->fp == NULL)
|
||||||
die_errno(_("could not open '%s'"), git_path(commit_editmsg));
|
die_errno(_("could not open '%s'"), git_path_commit_editmsg());
|
||||||
|
|
||||||
/* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
|
/* Ignore status.displayCommentPrefix: we do need comments in COMMIT_EDITMSG. */
|
||||||
old_display_comment_prefix = s->display_comment_prefix;
|
old_display_comment_prefix = s->display_comment_prefix;
|
||||||
|
@ -951,7 +952,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
|
if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
|
||||||
git_path(commit_editmsg), hook_arg1, hook_arg2, NULL))
|
git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (use_editor) {
|
if (use_editor) {
|
||||||
|
@ -959,7 +960,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||||
const char *env[2] = { NULL };
|
const char *env[2] = { NULL };
|
||||||
env[0] = index;
|
env[0] = index;
|
||||||
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
|
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
|
||||||
if (launch_editor(git_path(commit_editmsg), NULL, env)) {
|
if (launch_editor(git_path_commit_editmsg(), NULL, env)) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
_("Please supply the message using either -m or -F option.\n"));
|
_("Please supply the message using either -m or -F option.\n"));
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -967,7 +968,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!no_verify &&
|
if (!no_verify &&
|
||||||
run_commit_hook(use_editor, index_file, "commit-msg", git_path(commit_editmsg), NULL)) {
|
run_commit_hook(use_editor, index_file, "commit-msg", git_path_commit_editmsg(), NULL)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1738,7 +1739,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
|
||||||
|
|
||||||
/* Finally, get the commit message */
|
/* Finally, get the commit message */
|
||||||
strbuf_reset(&sb);
|
strbuf_reset(&sb);
|
||||||
if (strbuf_read_file(&sb, git_path(commit_editmsg), 0) < 0) {
|
if (strbuf_read_file(&sb, git_path_commit_editmsg(), 0) < 0) {
|
||||||
int saved_errno = errno;
|
int saved_errno = errno;
|
||||||
rollback_index_files();
|
rollback_index_files();
|
||||||
die(_("could not read commit message: %s"), strerror(saved_errno));
|
die(_("could not read commit message: %s"), strerror(saved_errno));
|
||||||
|
|
Loading…
Reference in a new issue