On Thu, Feb 23, 2012 at 9:53 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Luc Pionchon <pionchon.luc@xxxxxxxxx> writes:
>
>> Add the '*' modifier, similar to the '+' modifier,
>> to add a line-feed after a non-empty placeholder.
>
> Hrm, I thought I designed the plus and minus fairly carefully so that
> nobody needs to add this later.
>
> Wouldn't it be sufficient to write
>
> Foo%n%-d
>
> that says "We usually have LF after Foo, and write %d after that, but we
> might not have anything interesting in %d at all, in which case we don't
> add that %n"?
>
>> +test_expect_success 'add LF after non-empty (1) (empty)' '
>> + git show -s --pretty=format:"%*d%s%nfoo%n" HEAD^^ >actual &&
>
> Shouldn't this be equivalent to "%n%-d%s%nfoo%n", which in turn is covered
> by one of the previous tests (del LF before empty)?
Nope.
Try this:
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -208,6 +208,25 @@ test_expect_success 'add LF before non-empty (2)' '
grep "^$" actual
'
+test_expect_success 'add LF after non-empty (1) (empty)' '
+ git show -s --pretty=format:"%n%-d%s%nfoo%n" HEAD^^ >actual &&
+ cat >expect <<-EOF &&
+ added foo
+ foo
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'add LF after non-empty (2) (non empty)' '
+ git show -s --pretty=format:"%n%-d%s%nfoo%n" HEAD >actual &&
+ cat >expect <<-EOF &&
+ (HEAD, master)
+ Test printing of complex bodies
+ foo
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'add SP before non-empty (1)' '
git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
test $(wc -w <actual) = 2
Luc's patch makes these tests work.
I don't know if there's any way to have a format string that works
with the current code, but your suggestion doesn't seem to do the
trick.
Cheers.
--
Felipe Contreras
--
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