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: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
{
if (paths && paths[0])
diffcore_pathspec(paths);
{
if (paths && paths[0])
diffcore_pathspec(paths);
diffcore_break(break_opt);
if (detect_rename)
diffcore_rename(detect_rename, rename_score);
diffcore_break(break_opt);
if (detect_rename)
diffcore_rename(detect_rename, rename_score);
diffcore_merge_broken();
if (pickaxe)
diffcore_pickaxe(pickaxe, pickaxe_opts);
diffcore_merge_broken();
if (pickaxe)
diffcore_pickaxe(pickaxe, pickaxe_opts);