user/sven/git.git/notes.c, branch v1.8.3.3

Merge branch 'jc/prettier-pretty-note'

2012-11-15T18:25:05Z

Emit the notes attached to the commit in "format-patch --notes" output after three-dashes. * jc/prettier-pretty-note: format-patch: add a blank line between notes and diffstat Doc User-Manual: Patch cover letter, three dashes, and --notes Doc format-patch: clarify --notes use case Doc notes: Include the format-patch --notes option Doc SubmittingPatches: Mention --notes option after "cover letter" Documentation: decribe format-patch --notes format-patch --notes: show notes after three-dashes format-patch: append --signature after notes pretty_print_commit(): do not append notes message pretty: prepare notes message at a centralized place format_note(): simplify API pretty: remove reencode_commit_message()

Merge branch 'mh/notes-string-list'

2012-11-15T18:24:53Z

Improve the asymptotic performance of the cat_sort_uniq notes merge strategy. * mh/notes-string-list: string_list_add_refs_from_colon_sep(): use string_list_split() notes: fix handling of colon-separated values combine_notes_cat_sort_uniq(): sort and dedup lines all at once Initialize sort_uniq_list using named constant string_list: add a function string_list_remove_empty_items()

Merge branch 'jc/same-encoding'

2012-11-15T18:24:05Z

Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reencode_string(): introduce and use same_encoding() Conflicts: builtin/mailinfo.c

string_list_add_refs_from_colon_sep(): use string_list_split()

2012-11-08T16:34:44Z

It makes for simpler code than strbuf_split(). Signed-off-by: Michael Haggerty Acked-by: Johan Herland Signed-off-by: Jeff King

notes: fix handling of colon-separated values

2012-11-08T16:34:42Z

The substrings output by strbuf_split() include the ':' delimiters. When processing GIT_NOTES_DISPLAY_REF and GIT_NOTES_REWRITE_REF, strip off the delimiter character *before* checking whether the substring is empty rather than after, so that empty strings within the list are also skipped. Signed-off-by: Michael Haggerty Acked-by: Johan Herland Signed-off-by: Jeff King

combine_notes_cat_sort_uniq(): sort and dedup lines all at once

2012-11-08T16:34:36Z

Instead of reading lines one by one and insertion-sorting them into a string_list, read all of the lines, sort them, then remove duplicates. Aside from being less code, this reduces the complexity from O(N^2) to O(N lg N) in the total number of lines. Signed-off-by: Michael Haggerty Acked-by: Johan Herland Signed-off-by: Jeff King

Initialize sort_uniq_list using named constant

2012-11-08T16:34:22Z

Signed-off-by: Michael Haggerty Acked-by: Johan Herland Signed-off-by: Jeff King

reencode_string(): introduce and use same_encoding()

2012-11-04T13:10:33Z

Callers of reencode_string() that re-encodes a string from one encoding to another all used ad-hoc way to bypass the case where the input and the output encodings are the same. Some did strcmp(), some did strcasecmp(), yet some others when converting to UTF-8 used is_encoding_utf8(). Introduce same_encoding() helper function to make these callers use the same logic. Notably, is_encoding_utf8() has a work-around for common misconfiguration to use "utf8" to name UTF-8 encoding, which does not match "UTF-8" hence strcasecmp() would not consider the same. Make use of it in this helper function. Signed-off-by: Junio C Hamano

format_note(): simplify API

2012-10-18T05:42:40Z

We either stuff the notes message without modification for %N userformat, or format it for human consumption. Using two bits is an overkill that does not benefit anybody. Signed-off-by: Junio C Hamano

notes.c: mark a private file-scope symbol as static

2012-09-16T05:58:20Z

Signed-off-by: Junio C Hamano