summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-27 22:54:37 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-29 18:17:43 (GMT)
commit19feebc8c3ca7bd40f2f32f4f856b68b9a02870c (patch)
treee536ae939c90a8ce9c1278f6134ce5b6d1a72774 /diff.c
parent09d9d1a648ecff1dd914224b3ee616b0486ec525 (diff)
downloadgit-19feebc8c3ca7bd40f2f32f4f856b68b9a02870c.zip
git-19feebc8c3ca7bd40f2f32f4f856b68b9a02870c.tar.gz
git-19feebc8c3ca7bd40f2f32f4f856b68b9a02870c.tar.bz2
[PATCH] Clean up diff_setup() to make it more extensible.
This changes the argument of diff_setup() from an integer that says if we are feeding reversed diff to a bitmask, so that later global options can be added more easily. 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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index f15eb08..a116755 100644
--- a/diff.c
+++ b/diff.c
@@ -492,9 +492,10 @@ static void run_diff(const char *name,
run_external_diff(pgm, name, other, one, two, xfrm_msg);
}
-void diff_setup(int reverse_diff_)
+void diff_setup(int flags)
{
- reverse_diff = reverse_diff_;
+ if (flags & DIFF_SETUP_REVERSE)
+ reverse_diff = 1;
}
struct diff_queue_struct diff_queued_diff;