On Thu, Feb 23, 2012 at 21:53, 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"? What I want is a LF after the non empty, rather than before. It seems to me that %n%-d is equivalent to %+d, or did I miss something? See the 3 examples below, with %n%-d, %+d and %*d $ ./git log -5 --graph --pretty=format:"%C(yellow bold)%n%-d %C(reset)%s" * |\ (HEAD, origin/master, origin/HEAD, master) Sync with 1.7.9.2 | * | | (v1.7.9.2, origin/maint) Git 1.7.9.2 | * completion: use tabs for indentation | * completion: remove stale "to submit patches" documentation * | git-p4: the option to specify 'host' is -H, not -h $ ./git log -5 --graph --pretty=format:"%C(yellow bold)%+d %C(reset)%s" * |\ (HEAD, origin/master, origin/HEAD, master) Sync with 1.7.9.2 | * | | (v1.7.9.2, origin/maint) Git 1.7.9.2 | * completion: use tabs for indentation | * completion: remove stale "to submit patches" documentation * | git-p4: the option to specify 'host' is -H, not -h $ ./git log -5 --graph --pretty=format:"%C(yellow bold)%*d %C(reset)%s" * (HEAD, origin/master, origin/HEAD, master) |\ Sync with 1.7.9.2 | * (v1.7.9.2, origin/maint) | | Git 1.7.9.2 | * completion: use tabs for indentation | * completion: remove stale "to submit patches" documentation * | git-p4: the option to specify 'host' is -H, not -h Also as a side note, I noticed that color is lost after new lines. > > > +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)? I think the later is equivalent to %+d%s%nfoo%n, am I wrong? -- 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