提交 49d9e85d 编写于 作者: J Junio C Hamano 提交者: Linus Torvalds

[PATCH] diff.c: -B argument passing fix.

This fixes a bug that was preventing non-default parameter to -B
option to be passed correctly; you could not give more than 50%
break score.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 0601e131
......@@ -964,11 +964,11 @@ void diffcore_std(const char **paths,
{
if (paths && paths[0])
diffcore_pathspec(paths);
if (0 <= break_opt)
if (break_opt != -1)
diffcore_break(break_opt);
if (detect_rename)
diffcore_rename(detect_rename, rename_score);
if (0 <= break_opt)
if (break_opt != -1)
diffcore_merge_broken();
if (pickaxe)
diffcore_pickaxe(pickaxe, pickaxe_opts);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册