sequencer: comment out the 'squash!' line
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest1 patch 13 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/1 | sequencer: comment out the 'squash!' linesequencer.c t/ t/ +1 more | +30 | 2 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/1] sequencer: comment out the 'squash!' line
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.
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
Signature · 1 line
gitgitgadget