mirror of
https://github.com/git/git.git
synced 2024-11-19 02:33:55 +01:00
Add %m to '--pretty=format:'
When used with '--boundary A...B', this shows the -/</> marker you would get with --left-right option to 'git-log' family. When symmetric diff is not used, everybody is shown to be on the "right" branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
6aead43db3
commit
199c45bf2b
@ -117,6 +117,7 @@ The placeholders are:
|
||||
- '%Cgreen': switch color to green
|
||||
- '%Cblue': switch color to blue
|
||||
- '%Creset': reset color
|
||||
- '%m': left, right or boundary mark
|
||||
- '%n': newline
|
||||
|
||||
|
||||
|
16
commit.c
16
commit.c
@ -4,6 +4,8 @@
|
||||
#include "pkt-line.h"
|
||||
#include "utf8.h"
|
||||
#include "interpolate.h"
|
||||
#include "diff.h"
|
||||
#include "revision.h"
|
||||
|
||||
int save_commit_buffer = 1;
|
||||
|
||||
@ -808,7 +810,8 @@ static long format_commit_message(const struct commit *commit,
|
||||
{ "%Cgreen" }, /* green */
|
||||
{ "%Cblue" }, /* blue */
|
||||
{ "%Creset" }, /* reset color */
|
||||
{ "%n" } /* newline */
|
||||
{ "%n" }, /* newline */
|
||||
{ "%m" }, /* left/right/bottom */
|
||||
};
|
||||
enum interp_index {
|
||||
IHASH = 0, IHASH_ABBREV,
|
||||
@ -824,14 +827,15 @@ static long format_commit_message(const struct commit *commit,
|
||||
ISUBJECT,
|
||||
IBODY,
|
||||
IRED, IGREEN, IBLUE, IRESET_COLOR,
|
||||
INEWLINE
|
||||
INEWLINE,
|
||||
ILEFT_RIGHT,
|
||||
};
|
||||
struct commit_list *p;
|
||||
char parents[1024];
|
||||
int i;
|
||||
enum { HEADER, SUBJECT, BODY } state;
|
||||
|
||||
if (INEWLINE + 1 != ARRAY_SIZE(table))
|
||||
if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
|
||||
die("invalid interp table!");
|
||||
|
||||
/* these are independent of the commit */
|
||||
@ -852,6 +856,12 @@ static long format_commit_message(const struct commit *commit,
|
||||
interp_set_entry(table, ITREE_ABBREV,
|
||||
find_unique_abbrev(commit->tree->object.sha1,
|
||||
DEFAULT_ABBREV));
|
||||
interp_set_entry(table, ILEFT_RIGHT,
|
||||
(commit->object.flags & BOUNDARY)
|
||||
? "-"
|
||||
: (commit->object.flags & SYMMETRIC_LEFT)
|
||||
? "<"
|
||||
: ">");
|
||||
|
||||
parents[1] = 0;
|
||||
for (i = 0, p = commit->parents;
|
||||
|
Loading…
Reference in New Issue
Block a user