diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-27 15:54:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 11:17:43 -0700 |
| commit | 19feebc8c3ca7bd40f2f32f4f856b68b9a02870c (patch) | |
| tree | e536ae939c90a8ce9c1278f6134ce5b6d1a72774 /diff-tree.c | |
| parent | 09d9d1a648ecff1dd914224b3ee616b0486ec525 (diff) | |
| download | git-19feebc8c3ca7bd40f2f32f4f856b68b9a02870c.tar.gz | |
[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-tree.c')
| -rw-r--r-- | diff-tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/diff-tree.c b/diff-tree.c index 80d02b4f5b..c41cdd0d2e 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -10,7 +10,7 @@ static int show_tree_entry_in_recursive = 0; static int read_stdin = 0; static int diff_output_format = DIFF_FORMAT_HUMAN; 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; static const char *header = NULL; @@ -255,7 +255,7 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co static void call_diff_setup(void) { - diff_setup(reverse_diff); + diff_setup(diff_setup_opt); } static int call_diff_flush(void) @@ -497,7 +497,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, "-p")) { |