sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken line wrapping in --help for git invocations

pull/896/head
Wilfred Hughes 2025-10-07 09:33:53 +07:00
parent 640358fd7c
commit 5fb7684b38
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/options.rs
Unescape Escape View File

@ -108,25 +108,21 @@ fn app() -> clap::Command {
.to_string(), .to_string(),
); );
// For some reason clap will hard wrap these invocations weirdly
// (with extra blank lines) if we use bold. Since these are
// showing CLI formats rather than concrete values, compromise by
// not using bold.
after_help.push_str("\n\nDifftastic can also be invoked with 7 or 9 arguments in the format that GIT_EXTERNAL_DIFF expects.\n\n"); after_help.push_str("\n\nDifftastic can also be invoked with 7 or 9 arguments in the format that GIT_EXTERNAL_DIFF expects.\n\n");
after_help.push_str( after_help.push_str(&format!(
&format!( "$ {} DISPLAY-PATH OLD-FILE OLD-HEX OLD-MODE NEW-FILE NEW-HEX NEW-MODE",
"$ {} DISPLAY-PATH OLD-FILE OLD-HEX OLD-MODE NEW-FILE NEW-HEX NEW-MODE", bin_name
bin_name ));
)
.bold()
.to_string(),
);
after_help.push('\n'); after_help.push('\n');
after_help.push_str( after_help.push_str(&format!(
&format!( "$ {} OLD-NAME OLD-FILE OLD-HEX OLD-MODE NEW-FILE NEW-HEX NEW-MODE NEW-NAME METADATA",
"$ {} OLD-NAME OLD-FILE OLD-HEX OLD-MODE NEW-FILE NEW-HEX NEW-MODE NEW-NAME METADATA", bin_name
bin_name ));
)
.bold()
.to_string(),
);
after_help.push_str("\n\nSee the full manual at "); after_help.push_str("\n\nSee the full manual at ");
if std::io::stdout().is_tty() { if std::io::stdout().is_tty() {