From: "Michael Rappazzo via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] sequencer: comment out the 'squash!' line
Date: Mon, 06 Jan 2020 16:04:07 +0000 [thread overview]
Message-ID: <pull.511.git.1578326648.gitgitgadget@gmail.com> (raw)
When performing a squash commit, the commit comments are combined into a
single commit. Since the subject line of the squash commit is used to
identify the squash-to target commit, it cannot offer any useful
contribution to the new commit message. Therefore, the squash commit subject
line it commented out from the combined message (much like a fixup commit's
full comment).
The body of a squash commit may contain additional content to add to the
commit message, so this part of the squash commit message is retained.
Since this change what the expected post-rebase commit comment would look
like, related test expectations are adjusted to reflect the the new
expectation. A new test is added for the new expectation.
Signed-off-by: Michael Rappazzo rappazzo@gmail.com [rappazzo@gmail.com]
Michael Rappazzo (1):
sequencer: comment out the 'squash!' line
sequencer.c | 1 +
t/t3404-rebase-interactive.sh | 4 +---
t/t3415-rebase-autosquash.sh | 36 +++++++++++++++++++++++++++--------
t/t3900-i18n-commit.sh | 4 ----
4 files changed, 30 insertions(+), 15 deletions(-)
base-commit: 8679ef24ed64018bb62170c43ce73e0261c0600a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-511%2Frappazzo%2Fcomment-squash-subject-line-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-511/rappazzo/comment-squash-subject-line-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/511
--
gitgitgadget
next reply other threads:[~2020-01-06 16:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 16:04 Michael Rappazzo via GitGitGadget [this message]
2020-01-06 16:04 ` [PATCH 1/1] sequencer: comment out the 'squash!' line Michael Rappazzo via GitGitGadget
2020-01-06 17:10 ` Phillip Wood
2020-01-06 17:34 ` Mike Rappazzo
2020-01-06 17:32 ` [PATCH 0/1] " Junio C Hamano
2020-01-06 19:20 ` Mike Rappazzo
2020-01-06 19:32 ` Jeff King
2020-01-07 3:36 ` Jonathan Nieder
2020-01-07 11:15 ` Jeff King
2020-01-06 20:41 ` Junio C Hamano
2020-01-07 1:34 ` brian m. carlson
2020-01-07 16:15 ` Junio C Hamano
2020-01-08 2:55 ` brian m. carlson
2020-01-08 13:23 ` Johannes Schindelin
2020-01-08 16:53 ` 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=pull.511.git.1578326648.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).