Junio C Hamano dc7090efbc [PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p ...

When an unmerged path was fed via diff_unmerged() into diffcore,
it eventually called run_diff() with "one" and "two" parameters
with NULL, but run_diff() was not written carefully enough to
notice this situation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2005-06-12 20:29:31 -07:00

3.4 KiB

Raw Blame History

View Raw