[PATCH] diff.c: -B argument passing fix.
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Jun 2005 06:04:07 +0000 (23:04 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 5 Jun 2005 21:14:58 +0000 (14:14 -0700)
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>
diff.c

diff --git a/diff.c b/diff.c
index ab77b4bfedace3ef75fb3984542638d1fe3e3105..2762905b56a6a247f661a12d1573f1877d29a959 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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);