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

fill_textconv(): Don't get/put cache if sha1 is not valid

2010-12-20T02:41:32Z

When blaming files in the working tree, the filespec is marked with !sha1_valid, as we have not given the contents an object name yet. The function to cache textconv results (keyed on the object name), however, didn't check this condition, and ended up on storing the cached result under a random object name. Cc: Axel Bonnet Cc: Clément Poulain Cc: Diane Gasselin Cc: Jeff King Signed-off-by: Kirill Smelkov Signed-off-by: Junio C Hamano

Merge branch 'np/diff-in-corrupt-repository' into maint

2010-12-09T18:36:39Z

* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing

Merge branch 'cm/diff-check-at-eol' into maint

2010-12-09T18:36:10Z

* cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF

Merge branch 'cb/diff-fname-optim' into maint

2010-11-24T20:46:26Z

* cb/diff-fname-optim: diff: avoid repeated scanning while looking for funcname do not search functions for patch ID add rebase patch id tests

Merge branch 'jk/no-textconv-symlink' into maint

2010-11-24T20:46:20Z

* jk/no-textconv-symlink: diff: don't use pathname-based diff drivers for symlinks

Fix copy-pasted comments related to tree diff handling.

2010-10-25T07:21:56Z

Signed-off-by: Junio C Hamano

diff: don't presume empty file when corresponding object is missing

2010-10-22T05:23:34Z

The low-level diff code will happily produce totally bogus diff output with a broken repository via format-patch and friends by treating missing objects as empty files. Let's prevent that from happening any longer. Reported-by: Uwe Kleine-König Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano

diff --check: correct line numbers of new blank lines at EOF

2010-10-17T01:57:35Z

The whitespace check printed the value of the wrong variable, i.e. the beginning of the block of blank lines at the EOF (possibly absent) in the old file. As "git diff --check" is used by users to check their changes before making a commit, we should point at the line number in the file after the change. Signed-off-by: Christoph Mallon Signed-off-by: Junio C Hamano

diff: trivial fix for --output file error message

2010-09-29T20:25:17Z

The option argument is either after the equal sign in --output=... or in the next command-line argument. optarg is the reliable way to access it. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

do not search functions for patch ID

2010-09-24T01:35:07Z

Visual aids, such as the function name in the hunk header, are not necessary for the purposes of computing a patch ID. This is a performance optimization. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano