Since one can simply use spaces to indent any other --pretty field we
should have an option to do that with the body too.
Also the %B flag strips the trailing newlines, to enable more compact
display.
Signed-off-by: Johannes Gilger <heipei@xxxxxxxxxxxx>
---
Hey list,
in my never-ending quest to beautify my personal log output I just whipped this
up. Maybe you like it too or at least can tell me what's wrong with it ;)
Please CC me as I'm not on the list anymore (but keep up through Gmane though).
Documentation/pretty-formats.txt | 2 ++
pretty.c | 13 +++++++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 2a845b1..c04f118 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -123,6 +123,8 @@ The placeholders are:
- '%s': subject
- '%f': sanitized subject line, suitable for a filename
- '%b': body
+- '%B': body without trailing newline
+- '%B(x)': body indented with x spaces
- '%Cred': switch color to red
- '%Cgreen': switch color to green
- '%Cblue': switch color to blue
diff --git a/pretty.c b/pretty.c
index f5983f8..6d530e1 100644
--- a/pretty.c
+++ b/pretty.c
@@ -735,6 +735,19 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
case 'b': /* body */
strbuf_addstr(sb, msg + c->body_off);
return 1;
+ case 'B':
+ if (placeholder[1] == '(') {
+ const char *body = msg + c->body_off;
+ const char *end = strchr(placeholder + 2, ')');
+ if(!end)
+ return 0;
+ pp_remainder(CMIT_FMT_MEDIUM, &body, sb, atoi(placeholder + 2));
+ strbuf_rtrim(sb);
+ return end - placeholder + 1;
+ }
+ strbuf_addstr(sb, msg + c->body_off);
+ strbuf_rtrim(sb);
+ return 1;
}
return 0; /* unknown placeholder */
}
--
1.6.5.rc1.20.geb7d9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html