![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 13 Jun 2005 00:23:15 +0000 (17:23 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 13 Jun 2005 03:29:31 +0000 (20:29 -0700) | ||
| commit | dc7090efbc8280e482a6b2dc7419e525cbc3c5d7 | |
| tree | f481f10db8f32aa27f69bb0a9965088c92194444 | tree | snapshot |
| parent | 206de27efac383cecc3d0f938e220dc359be36c1 | commit | diff |
[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>
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>
| diff.c | diff | blob | history | |
| diffcore.h | diff | blob | history |