From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Jun 2005 06:04:07 +0000 (-0700)
Subject: [PATCH] diff.c: -B argument passing fix.
X-Git-Tag: v0.99~360
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=49d9e85d1103fe1d0fcb73956643b93acc5c1f4f;p=git.git

[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>
---

diff --git a/diff.c b/diff.c
index ab77b4bf..2762905b 100644
--- 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);