git/pretty.c, branch v2.10.2

Merge branch 'rs/cocci' into maint

2016-10-28T16:01:23Z

Code cleanup. * rs/cocci: use strbuf_add_unique_abbrev() for adding short hashes, part 3 remove unnecessary NULL check before free(3) coccicheck: make transformation for strbuf_addf(sb, "...") more precise use strbuf_add_unique_abbrev() for adding short hashes, part 2 use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 gitignore: ignore output files of coccicheck make target use strbuf_addstr() for adding constant strings to a strbuf, part 2 add coccicheck make target contrib/coccinelle: fix semantic patch for oid_to_hex_r()

Merge branch 'rs/c-auto-resets-attributes' into maint

2016-10-28T16:01:11Z

When "%C(auto)" appears at the very beginning of the pretty format string, it did not need to issue the reset sequence, but it did. This is a small optimization to already graduated topic. * rs/c-auto-resets-attributes: pretty: avoid adding reset for %C(auto) if output is empty pretty: let %C(auto) reset all attributes

use strbuf_add_unique_abbrev() for adding short hashes, part 3

2016-10-10T18:58:25Z

Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs instead of taking detours through find_unique_abbrev() and its static buffer. This is shorter in most cases and a bit more efficient. The changes here are not easily handled by a semantic patch because they involve removing temporary variables and deconstructing format strings for strbuf_addf(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

pretty: avoid adding reset for %C(auto) if output is empty

2016-09-30T03:44:09Z

We emit an escape sequence for resetting color and attribute for %C(auto) to make sure automatic coloring is displayed as intended. Stop doing that if the output strbuf is empty, i.e. when %C(auto) appears at the start of the format string, because then there is no need for a reset and we save a few bytes in the output. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/hex2chr' into maint

2016-09-19T20:51:43Z

Code cleanup. * rs/hex2chr: introduce hex2chr() for converting two hexadecimal digits to a character

pretty: let %C(auto) reset all attributes

2016-09-19T17:50:32Z

Reset colors and attributes upon %C(auto) to enable full automatic control over them; otherwise attributes like bold or reverse could still be in effect from previous %C placeholders. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

introduce hex2chr() for converting two hexadecimal digits to a character

2016-09-07T17:42:46Z

Add and use a helper function that decodes the char value of two hexadecimal digits. It returns a negative number on error, avoids running over the end of the given string and doesn't shift negative values. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/use-strbuf-add-unique-abbrev'

2016-08-12T16:47:37Z

A small code clean-up. * rs/use-strbuf-add-unique-abbrev: use strbuf_add_unique_abbrev() for adding short hashes

use strbuf_add_unique_abbrev() for adding short hashes

2016-08-06T17:33:57Z

Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs instead of taking detours through find_unique_abbrev() and its static buffer. This is shorter and a bit more efficient. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint

2016-07-28T18:25:50Z

A helper function that takes the contents of a commit object and finds its subject line did not ignore leading blank lines, as is commonly done by other codepaths. Make it ignore leading blank lines to match. * js/find-commit-subject-ignore-leading-blanks: reset --hard: skip blank lines when reporting the commit subject sequencer: use skip_blank_lines() to find the commit subject commit -C: skip blank lines at the beginning of the message commit.c: make find_commit_subject() more robust pretty: make the skip_blank_lines() function public