Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

notepad: don't break comments in COMMIT_EDITMSG #218

Merged
merged 1 commit into from
Dec 6, 2018

Conversation

rimrul
Copy link
Member

@rimrul rimrul commented Dec 5, 2018

Wrapping lines with fmt could cause comments in COMMIT_EDITMSG to turn into a
comment line and one or more non-comment lines. Wrapping just the comments with
the -p option before wrapping the other lines prevents this from happening.

This fixes git-for-windows/git#1967

I've marked this as "don't merge yet", because I haven't tested it yet. Will update this PR soon.

Wrapping lines with fmt could cause comments in COMMIT_EDITMSG to turn into a
comment line and one or more non-comment lines. Wrapping just the comments with
the -p option before wrapping the other lines prevents this from happening.

This fixes git-for-windows/git#1967

Signed-off-by: Matthias Aßhauer <[email protected]>
@rimrul rimrul changed the title [Don't merge yet]notepad: don't break comments in COMMIT_EDITMSG notepad: don't break comments in COMMIT_EDITMSG Dec 5, 2018
@rimrul
Copy link
Member Author

rimrul commented Dec 5, 2018

I've tested it and it seems to work as intended.

@dscho
Copy link
Member

dscho commented Dec 6, 2018

Very neat, thanks!

@dscho dscho merged commit 4c62787 into git-for-windows:master Dec 6, 2018
dscho added a commit that referenced this pull request Dec 6, 2018
A bug in the `notepad` support in conjunction with line wrapping
[was fixed](#218).

Signed-off-by: Johannes Schindelin <[email protected]>
@rimrul rimrul deleted the patch-1 branch June 26, 2020 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Line-wrap in notepad sometimes include source file names in message
2 participants