summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-04 06:04:07 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 21:14:58 (GMT)
commit49d9e85d1103fe1d0fcb73956643b93acc5c1f4f (patch)
tree1ac754eaf1b41a516a77c22ce0446621d0a73459 /diff.c
parent0601e131c95940701c153e35ba73b97914ec0b3f (diff)
downloadgit-49d9e85d1103fe1d0fcb73956643b93acc5c1f4f.zip
git-49d9e85d1103fe1d0fcb73956643b93acc5c1f4f.tar.gz
git-49d9e85d1103fe1d0fcb73956643b93acc5c1f4f.tar.bz2
[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>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index ab77b4b..2762905 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);