Instead of replacing with "..", replace with the empty string "",
having adjusted the padding length calculation.
Needswork:
There are no tests for these pretty formats, before or after
this change.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
Documentation/pretty-formats.txt | 7 ++++---
pretty.c | 18 +++++++++++++++++-
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 0b4c1c8d98..bd1657c032 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -146,14 +146,15 @@ The placeholders are:
'%m':: left (`<`), right (`>`) or boundary (`-`) mark
'%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of
linkgit:git-shortlog[1].
-'%<(<N>[,trunc|ltrunc|mtrunc])':: make the next placeholder take at
+'%<(<N>[,trunc|ltrunc|mtrunc|Trunc|Ltrunc])':: make the next placeholder take at
least N columns, padding spaces on
the right if necessary. Optionally
- truncate at the beginning (ltrunc),
+ truncate (with ellipsis '..') at the beginning (ltrunc),
the middle (mtrunc) or the end
(trunc) if the output is longer than
- N columns. Note that truncating
+ N columns. Note that truncating with ellipsis
only works correctly with N >= 2.
+ Use (Trunc|Ltrunc) for hard truncation without ellipsis.
'%<|(<N>)':: make the next placeholder take at least until Nth
columns, padding spaces on the right if necessary
'%>(<N>)', '%>|(<N>)':: similar to '%<(<N>)', '%<|(<N>)' respectively,
diff --git a/pretty.c b/pretty.c
index 6cb363ae1c..f67844d638 100644
--- a/pretty.c
+++ b/pretty.c
@@ -857,7 +857,9 @@ enum trunc_type {
trunc_none,
trunc_left,
trunc_middle,
- trunc_right
+ trunc_right,
+ trunc_left_hard,
+ trunc_right_hard
};
struct format_commit_context {
@@ -1145,6 +1147,10 @@ static size_t parse_padding_placeholder(const char *placeholder,
c->truncate = trunc_left;
else if (starts_with(start, "mtrunc)"))
c->truncate = trunc_middle;
+ else if (starts_with(start, "Ltrunc)"))
+ c->truncate = trunc_left_hard;
+ else if (starts_with(start, "Trunc)"))
+ c->truncate = trunc_right_hard;
else
return 0;
} else
@@ -1743,6 +1749,16 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
padding - 2, len - (padding - 2),
"..");
break;
+ case trunc_left_hard:
+ strbuf_utf8_replace(&local_sb,
+ 0, len - (padding),
+ "");
+ break;
+ case trunc_right_hard:
+ strbuf_utf8_replace(&local_sb,
+ padding, len - (padding),
+ "");
+ break;
case trunc_none:
break;
}
--
2.38.1.281.g83ef3ded8d
