From 4727f640036fbdad414bdcbe31d08f6a8fd70923 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 19 Jun 2005 13:14:05 -0700 Subject: [PATCH] Make -C less eager. Like diff-tree, this patch makes -C option for diff-* brothers to use only pre-image of modified files as rename/copy detection by default. Give --find-copies-harder to use unmodified files to find copies from as well. This also fixes "diff-files -C" problem earlier noticed by Linus. It was feeding the null sha1 even when the file in the work tree was known to match what is in the index file. This resulted in diff-files showing everything in the project. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'diff-tree.c') diff --git a/diff-tree.c b/diff-tree.c index 2075715350..7446e09af4 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -201,7 +201,7 @@ static int interesting(void *tree, unsigned long size, const char *base) static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base) { while (size) { - if (find_copies_harder || interesting(tree, size, base)) + if (interesting(tree, size, base)) show_file(prefix, tree, size, base); update_tree_entry(&tree, &size); } @@ -269,7 +269,7 @@ static void call_diff_setup(void) static int call_diff_flush(void) { - diffcore_std(find_copies_harder ? paths : 0, + diffcore_std(NULL, detect_rename, diff_score_opt, pickaxe, pickaxe_opts, diff_break_opt, @@ -401,7 +401,7 @@ static int diff_tree_stdin(char *line) } static char *diff_tree_usage = -"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S] [-O] [-m] [-s] [-v] [--pretty] [-t] "; +"git-diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-R] [-B] [-M] [-C] [--find-copies-header] [-O] [-S] [--pickaxe-all] "; static enum cmit_fmt get_commit_format(const char *arg) { -- cgit v1.2.1