git/pretty.c, branch v1.6.3

format_sanitized_subject: Don't trim past initial length of strbuf

2009-04-01T18:05:31Z

If the subject line is '...' the strbuf will be accessed before the first dot is added; potentially changing the strbuf passed into the function or accessing sb->buf[-1] if it was originally empty. Reported-by: René Scharfe Signed-off-by: Junio C Hamano

pretty.c: add %f format specifier to format_commit_message()

2009-03-23T04:32:13Z

This specifier represents the sanitized and filename friendly subject line of a commit. No checks are made against the length of the string, so users may need to trim the result to the desired length if using as a filename. This is commonly used by format-patch to massage commit subjects into filenames and output patches to files. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

Remove unused assignments

2009-03-14T20:36:34Z

These variables were always overwritten or the assigned value was unused: builtin-diff-tree.c::cmd_diff_tree(): nr_sha1 builtin-for-each-ref.c::opt_parse_sort(): sort_tail builtin-mailinfo.c::decode_header_bq(): in builtin-shortlog.c::insert_one_record(): len connect.c::git_connect(): path imap-send.c::v_issue_imap_cmd(): n pretty.c::pp_user_info(): filler remote::parse_refspec_internal(): llen Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-03-08T06:34:13Z

* maint: builtin-revert.c: release index lock when cherry-picking an empty commit document config --bool-or-int t1300: use test_must_fail as appropriate cleanup: add isascii() Documentation: fix badly indented paragraphs in "--bisect-all" description

cleanup: add isascii()

2009-03-07T19:22:42Z

Add a standard definition of isascii() and use it to replace an open coded high-bit test in pretty.c. While we're there, write the ESC char as the more commonly used '\033' instead of as 0x1b to enhance its grepability. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'ns/pretty-format'

2009-03-05T23:41:43Z

* ns/pretty-format: bash completion: add --format= and --oneline options for "git log" Add tests for git log --pretty, --format and --oneline. Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit" Give short-hands to --pretty=tformat:%formatstring Add --format that is a synonym to --pretty

Merge branch 'al/ansi-color'

2009-03-05T23:41:19Z

* al/ansi-color: builtin-branch.c: Rename branch category color names Clean up use of ANSI color sequences

Give short-hands to --pretty=tformat:%formatstring

2009-02-25T07:53:38Z

Allow --pretty="%h %s" (and --format="%h %s") as shorthand for an often used option --pretty=tformat:"%h %s". Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano

Merge branch 'ms/mailmap'

2009-02-15T09:44:15Z

* ms/mailmap: Move mailmap documentation into separate file Change current mailmap usage to do matching on both name and email of author/committer. Add map_user() and clear_mailmap() to mailmap Add find_insert_index, insert_at_index and clear_func functions to string_list Add mailmap.file as configurational option for mailmap location

Clean up use of ANSI color sequences

2009-02-14T01:27:58Z

Remove the literal ANSI escape sequences and replace them by readable constants. Signed-off-by: Arjen Laarhoven Signed-off-by: Junio C Hamano