From 19feebc8c3ca7bd40f2f32f4f856b68b9a02870c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 27 May 2005 15:54:37 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- diff-cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'diff-cache.c') diff --git a/diff-cache.c b/diff-cache.c index d573459ba4..963c628ed4 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -5,7 +5,7 @@ static int cached_only = 0; static int diff_output_format = DIFF_FORMAT_HUMAN; static int match_nonexisting = 0; static int detect_rename = 0; -static int reverse_diff = 0; +static int diff_setup_opt = 0; static int diff_score_opt = 0; static const char *pickaxe = NULL; @@ -202,7 +202,7 @@ int main(int argc, const char **argv) continue; } if (!strcmp(arg, "-R")) { - reverse_diff = 1; + diff_setup_opt |= DIFF_SETUP_REVERSE; continue; } if (!strcmp(arg, "-S")) { @@ -224,7 +224,7 @@ int main(int argc, const char **argv) usage(diff_cache_usage); /* The rest is for paths restriction. */ - diff_setup(reverse_diff); + diff_setup(diff_setup_opt); mark_merge_entries(); -- cgit v1.2.1