diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-13 02:23:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 05:29:31 +0200 |
| commit | dc7090efbc8280e482a6b2dc7419e525cbc3c5d7 (patch) | |
| tree | f481f10db8f32aa27f69bb0a9965088c92194444 /t/t1001-read-tree-m-2way.sh | |
| parent | git-apply: ignore empty git headers (diff) | |
| download | git-dc7090efbc8280e482a6b2dc7419e525cbc3c5d7.tar.xz git-dc7090efbc8280e482a6b2dc7419e525cbc3c5d7.zip | |
[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>
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
0 files changed, 0 insertions, 0 deletions