undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/pretty-magic-space'

Browse Source 
* mg/pretty-magic-space:
  pretty: Introduce ' ' modifier to add space if non-empty

Conflicts:
	pretty.c
This commit is contained in:
Junio C Hamano 2010-06-22 09:45:22 -07:00
commit 223a923c37
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/pretty-formats.txt
View File

@ -159,6 +159,10 @@ If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
immediately precede the expansion are deleted if and only if the immediately precede the expansion are deleted if and only if the
placeholder expands to an empty string. placeholder expands to an empty string.
If you add a ` ` (space) after '%' of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.
* 'tformat:' * 'tformat:'
+ +
The 'tformat:' format works exactly like 'format:', except that it The 'tformat:' format works exactly like 'format:', except that it

13
pretty.c
View File

@ -941,7 +941,8 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
enum { enum {
NO_MAGIC, NO_MAGIC,
ADD_LF_BEFORE_NON_EMPTY, ADD_LF_BEFORE_NON_EMPTY,
DEL_LF_BEFORE_EMPTY DEL_LF_BEFORE_EMPTY,
ADD_SP_BEFORE_NON_EMPTY
} magic = NO_MAGIC; } magic = NO_MAGIC;
switch (placeholder[0]) { switch (placeholder[0]) {
@ -951,6 +952,9 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
case '+': case '+':
magic = ADD_LF_BEFORE_NON_EMPTY; magic = ADD_LF_BEFORE_NON_EMPTY;
break; break;
case ' ':
magic = ADD_SP_BEFORE_NON_EMPTY;
break;
default: default:
break; break;
} }
@ -965,8 +969,11 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) { if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
while (sb->len && sb->buf[sb->len - 1] == '\n') while (sb->len && sb->buf[sb->len - 1] == '\n')
strbuf_setlen(sb, sb->len - 1); strbuf_setlen(sb, sb->len - 1);
} else if ((orig_len != sb->len) && magic == ADD_LF_BEFORE_NON_EMPTY) { } else if (orig_len != sb->len) {
if (magic == ADD_LF_BEFORE_NON_EMPTY)
strbuf_insert(sb, orig_len, "\n", 1); strbuf_insert(sb, orig_len, "\n", 1);
else if (magic == ADD_SP_BEFORE_NON_EMPTY)
strbuf_insert(sb, orig_len, " ", 1);
} }
return consumed + 1; return consumed + 1;
} }
@ -976,7 +983,7 @@ static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
{ {
struct userformat_want *w = context; struct userformat_want *w = context;
if (*placeholder == '+' || *placeholder == '-') if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
placeholder++; placeholder++;
switch (*placeholder) { switch (*placeholder) {

10
t/t6006-rev-list-format.sh
View File

@ -200,6 +200,16 @@ test_expect_success 'add LF before non-empty (2)' '
grep "^$" actual grep "^$" actual
' '
test_expect_success 'add SP before non-empty (1)' '
git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
test $(wc -w <actual) = 2
'
test_expect_success 'add SP before non-empty (2)' '
git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
test $(wc -w <actual) = 4
'
test_expect_success '--abbrev' ' test_expect_success '--abbrev' '
echo SHORT SHORT SHORT >expect2 && echo SHORT SHORT SHORT >expect2 &&
echo LONG LONG LONG >expect3 && echo LONG LONG LONG >expect3 &&