undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-06-03 23:04:07 -07:00 committed by Linus Torvalds
parent 0601e131c9
commit 49d9e85d11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -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);