Skip to content

fix(reword): Wrap rewording instructions to 72 chars #1204

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 30, 2024
Merged

fix(reword): Wrap rewording instructions to 72 chars #1204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions git-branchless-reword/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,9 @@ fn prepare_messages(
message.push_str(
format!(
"\
{} Rewording: Please enter the commit {} to apply to {}. Lines\n\
{} starting with '{}' will be ignored, and an empty message aborts rewording.",
{} Rewording: Please enter the commit {} to apply to {}.\n\
{} Lines starting with '{}' will be ignored, and an empty message aborts\n\
{} rewording.",
comment_char,
match commits.len() {
1 => "message",
Expand All @@ -478,6 +479,7 @@ fn prepare_messages(
},
comment_char,
comment_char,
comment_char,
)
.as_str(),
);
Expand Down Expand Up @@ -721,12 +723,12 @@ mod tests {
&[head_commit.clone()],
|message| {
insta::assert_snapshot!(message.trim(), @r###"

# Original message:
# create test1.txt

# Rewording: Please enter the commit message to apply to this 1 commit. Lines
# starting with '#' will be ignored, and an empty message aborts rewording.
# Rewording: Please enter the commit message to apply to this 1 commit.
# Lines starting with '#' will be ignored, and an empty message aborts
# rewording.
"###);
Ok(message.to_string())
},
Expand Down Expand Up @@ -754,8 +756,9 @@ This is a template!
# Original message:
# create test1.txt

# Rewording: Please enter the commit message to apply to this 1 commit. Lines
# starting with '#' will be ignored, and an empty message aborts rewording.
# Rewording: Please enter the commit message to apply to this 1 commit.
# Lines starting with '#' will be ignored, and an empty message aborts
# rewording.
"###);
Ok(message.to_string())
},
Expand Down Expand Up @@ -790,8 +793,9 @@ This is a template!
++ reword 96d1c37
create test2.txt

# Rewording: Please enter the commit messages to apply to these 2 commits. Lines
# starting with '#' will be ignored, and an empty message aborts rewording.
# Rewording: Please enter the commit messages to apply to these 2 commits.
# Lines starting with '#' will be ignored, and an empty message aborts
# rewording.
"###);
Ok(message.to_string())
},
Expand Down