git/contrib, branch v2.4.2

Merge branch 'sg/complete-decorate-full-not-long' into maint

2015-05-26T20:49:22Z

The completion for "log --decorate=" parameter value was incorrect. * sg/complete-decorate-full-not-long: completion: fix and update 'git log --decorate=' options

completion: fix and update 'git log --decorate=' options

2015-05-03T18:46:14Z

'git log --decorate=' understands the 'full', 'short' and 'no' options. From these the completion script only offered 'short' and it offered 'long' instead of 'full'. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Merge branch 'mh/multimail-renewal'

2015-04-28T20:01:29Z

* mh/multimail-renewal: Update git-multimail to version 1.0.2

Update git-multimail to version 1.0.2

2015-04-28T18:37:09Z

The only changes are to the README files, most notably the list of maintainers and the project URL. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

Merge branch 'ma/bash-completion-leaking-x' into maint

2015-04-27T19:23:51Z

The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend

Merge branch 'jk/colors' into maint

2015-04-21T19:12:25Z

"diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters

Merge branch 'ma/bash-completion-leaking-x'

2015-04-20T22:28:30Z

The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend

Merge branch 'jk/colors'

2015-04-14T18:49:13Z

completion: fix global bash variable leak on __gitcompappend

2015-04-13T05:35:51Z

Signed-off-by: Junio C Hamano

diff-highlight: do not split multibyte characters

2015-04-04T20:03:45Z

When the input is UTF-8 and Perl is operating on bytes instead of characters, a diff that changes one multibyte character to another that shares an initial byte sequence will result in a broken diff display as the common byte sequence prefix will be separated from the rest of the bytes in the multibyte character. For example, if a single line contains only the unicode character U+C9C4 (encoded as UTF-8 0xEC, 0xA7, 0x84) and that line is then changed to the unicode character U+C9C0 (encoded as UTF-8 0xEC, 0xA7, 0x80), when operating on bytes diff-highlight will show only the single byte change from 0x84 to 0x80 thus creating invalid UTF-8 and a broken diff display. Fix this by putting Perl into character mode when splitting the line and then back into byte mode after the split is finished. The utf8::xxx functions require Perl 5.8 so we require that as well. Also, since we are mucking with code in the split_line function, we change a '*' quantifier to a '+' quantifier when matching the $COLOR expression which has the side effect of speeding everything up while eliminating useless '' elements in the returned array. Reported-by: Yi EungJun Signed-off-by: Kyle J. McKay Acked-by: Jeff King Signed-off-by: Junio C Hamano