user/sven/git.git/diff.c, branch v1.5.4.4

Use a single implementation and API for copy_file()

2008-02-25T21:06:49Z

Originally by Kristian Hï¿œgsberg; I fixed the conversion of rerere, which had a different API. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

diff: Fix miscounting of --check output

2008-02-16T07:06:57Z

c1795bb (Unify whitespace checking) incorrectly made the checking function return without incrementing the line numbers when there is no whitespace problem is found on a '+' line. This resurrects the earlier behaviour. Noticed and reported by Jay Soffian. The test script was stolen from Jay's independent fix. Signed-off-by: Junio C Hamano

diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"

2008-02-16T05:24:54Z

Also use "git_config_string" to simplify code where "cmd" is set. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

diff.c: remove useless check for value != NULL

2008-02-16T05:24:53Z

It is not necessary to check if value != NULL before calling 'parse_lldiff_command' as there is already a check inside this function. By the way this patch also improves the existing check inside 'parse_lldiff_command' by using: return config_error_nonbool(var); instead of: return error("%s: lacks value", var); Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

diff.c: replace a 'strdup' with 'xstrdup'.

2008-02-15T22:11:28Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

diff.c: fixup garding of config parser from value=NULL

2008-02-15T17:37:54Z

Christian Couder noticed that there still were a handcrafted error() call that we should have converted to config_error_nonbool() where parse_lldiff_command() parses the configuration file. Signed-off-by: Junio C Hamano

diff.c: guard config parser from value=NULL

2008-02-11T21:11:36Z

diff.external, diff.*.command, diff.color.*, color.diff.* and diff.*.funcname configuration variables expect a string value. Signed-off-by: Junio C Hamano

color unchanged lines as "plain" in "diff --color-words"

2008-01-18T09:29:38Z

These were mistakenly being colored in "meta" color. Signed-off-by: Junio C Hamano

Correct spelling in diff.c comment

2008-01-16T19:37:58Z

Correct a spelling mistake in a comment. Signed-off-by: Bill Lear Signed-off-by: Junio C Hamano

diff: do not chomp hunk-header in the middle of a character

2008-01-07T06:44:44Z

We truncate hunk-header line at 80 bytes, but that 80th byte could be in the middle of a character, which is bad. This uses pick_one_utf8_char() function to make sure we do not cut a character in the middle. This assumes that the internal representation of the text is UTF-8. This needs to be extended in the future but the optimal direction has not been decided yet. Signed-off-by: Junio C Hamano