From: Junio C Hamano <gitster@pobox•com>
To: Sven Strickroth <sven@cs-ware•de>
Cc: Git List <git@vger•kernel.org>
Subject: Re: [PATCH] commit: do not lose SQUASH_MSG contents
Date: Mon, 14 Mar 2016 11:19:18 -0700 [thread overview]
Message-ID: <xmqqpouwapnd.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <56E5B3F9.6070404@cs-ware.de> (Sven Strickroth's message of "Sun, 13 Mar 2016 19:39:53 +0100")
Sven Strickroth <sven@cs-ware•de> writes:
> When concluding a conflicted "git merge --squash", the command
> failed to read SQUASH_MSG that was prepared by "git merge", and
> showed only the "# Conflicts:" list of conflicted paths.
>
> Place the contents from SQUASH_MSG at the beginning, just like we
> show the commit log skeleton first when concluding a normal merge,
> and then show the "# Conflicts:" list, to help the user write the
> log message for the resulting commit.
>
> Signed-off-by: Sven Strickroth <sven@cs-ware•de>
> ---
> builtin/commit.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
The updated code looks good to me; sorry for misleading you with
fuzzy comments earlier.
We may want to have a test to prevent this from getting broken in
the future updates.
> diff --git a/builtin/commit.c b/builtin/commit.c
> index d054f84..d40b788 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -726,9 +726,18 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
> &sb, &ctx);
> hook_arg1 = "message";
> } else if (!stat(git_path_merge_msg(), &statbuf)) {
> + /*
> + * prepend SQUASH_MSG here if it exists and a
> + * "merge --squash" was originally performed
> + */
> + if (!stat(git_path_squash_msg(), &statbuf)) {
> + if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
> + die_errno(_("could not read SQUASH_MSG"));
> + hook_arg1 = "squash";
> + } else
> + hook_arg1 = "merge";
> if (strbuf_read_file(&sb, git_path_merge_msg(), 0) < 0)
> die_errno(_("could not read MERGE_MSG"));
> - hook_arg1 = "merge";
> } else if (!stat(git_path_squash_msg(), &statbuf)) {
> if (strbuf_read_file(&sb, git_path_squash_msg(), 0) < 0)
> die_errno(_("could not read SQUASH_MSG"));
next prev parent reply other threads:[~2016-03-14 18:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-05 10:38 Commit message not helpful after merge squash with conflicts Sven Strickroth
2016-03-08 4:17 ` [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred Sven Strickroth
2016-03-08 18:32 ` Junio C Hamano
2016-03-08 18:49 ` Sven Strickroth
2016-03-08 18:51 ` Junio C Hamano
2016-03-08 19:03 ` [PATCH] commit: do not lose SQUASH_MSG contents Sven Strickroth
2016-03-09 18:04 ` [PATCH] Also read SQUASH_MSG if a conflict on a merge squash occurred Junio C Hamano
2016-03-09 20:24 ` Junio C Hamano
2016-03-13 18:39 ` [PATCH] commit: do not lose SQUASH_MSG contents Sven Strickroth
2016-03-14 18:19 ` Junio C Hamano [this message]
2016-03-14 20:19 ` Junio C Hamano
2016-03-21 22:29 ` Sven Strickroth
2016-03-21 22:34 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpouwapnd.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sven@cs-ware$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox