kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

commit: unify logic to avoid multiple scissors lines when merging 

prepare_to_commit has some logic to figure out whether merge already
added a scissors line, and therefore it shouldn't add another. Now that
wt_status_add_cut_line has built-in state for whether it has
already added a previous line, just set that state instead, and then
remove that condition from subsequent calls to wt_status_add_cut_line.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Josh Triplett 2024-02-27 01:17:36 -08:00 committed by Junio C Hamano
parent 688a0a751e
commit e90cc075cc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/commit.c
View File

@ -737,7 +737,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
const char *hook_arg2 = NULL; const char *hook_arg2 = NULL;
int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE); int clean_message_contents = (cleanup_mode != COMMIT_MSG_CLEANUP_NONE);
int old_display_comment_prefix; int old_display_comment_prefix;
int merge_contains_scissors = 0;
int invoked_hook; int invoked_hook;


/* This checks and barfs if author is badly specified */ /* This checks and barfs if author is badly specified */
@ -841,7 +840,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
wt_status_locate_end(sb.buf + merge_msg_start, wt_status_locate_end(sb.buf + merge_msg_start,
sb.len - merge_msg_start) < sb.len - merge_msg_start) <
sb.len - merge_msg_start) sb.len - merge_msg_start)
merge_contains_scissors = 1; s->added_cut_line = 1;
} else if (!stat(git_path_squash_msg(the_repository), &statbuf)) { } else if (!stat(git_path_squash_msg(the_repository), &statbuf)) {
if (strbuf_read_file(&sb, git_path_squash_msg(the_repository), 0) < 0) if (strbuf_read_file(&sb, git_path_squash_msg(the_repository), 0) < 0)
die_errno(_("could not read SQUASH_MSG")); die_errno(_("could not read SQUASH_MSG"));
@ -924,8 +923,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
" yourself if you want to.\n" " yourself if you want to.\n"
"An empty message aborts the commit.\n"); "An empty message aborts the commit.\n");
if (whence != FROM_COMMIT) { if (whence != FROM_COMMIT) {
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS && if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
!merge_contains_scissors)
wt_status_add_cut_line(s); wt_status_add_cut_line(s);
status_printf_ln( status_printf_ln(
s, GIT_COLOR_NORMAL, s, GIT_COLOR_NORMAL,
@ -946,7 +944,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL) if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL)
status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_all, comment_line_char); status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_all, comment_line_char);
else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) { else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
if (whence == FROM_COMMIT && !merge_contains_scissors) if (whence == FROM_COMMIT)
wt_status_add_cut_line(s); wt_status_add_cut_line(s);
} else /* COMMIT_MSG_CLEANUP_SPACE, that is. */ } else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_space, comment_line_char); status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_space, comment_line_char);