Browse Source

[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: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
maint
Junio C Hamano 20 years ago committed by Linus Torvalds
parent
commit
49d9e85d11
  1. 4
      diff.c

4
diff.c

@ -964,11 +964,11 @@ void diffcore_std(const char **paths, @@ -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);

Loading…
Cancel
Save