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-files.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'diff-files.c') diff --git a/diff-files.c b/diff-files.c index b6d972e062..4d60017e46 100644 --- a/diff-files.c +++ b/diff-files.c @@ -7,10 +7,11 @@ #include "diff.h" static const char *diff_files_usage = -"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S] [-O] [paths...]"; +"git-diff-files [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O] [-S] [--pickaxe-all] [...]"; static int diff_output_format = DIFF_FORMAT_HUMAN; static int detect_rename = 0; +static int find_copies_harder = 0; static int diff_setup_opt = 0; static int diff_score_opt = 0; static const char *pickaxe = NULL; @@ -81,11 +82,16 @@ int main(int argc, const char **argv) usage(diff_files_usage); detect_rename = DIFF_DETECT_COPY; } + else if (!strcmp(argv[1], "--find-copies-harder")) + find_copies_harder = 1; else usage(diff_files_usage); argv++; argc--; } + if (find_copies_harder && detect_rename != DIFF_DETECT_COPY) + usage(diff_files_usage); + /* At this point, if argc == 1, then we are doing everything. * Otherwise argv[1] .. argv[argc-1] have the explicit paths. */ @@ -122,12 +128,11 @@ int main(int argc, const char **argv) continue; } changed = ce_match_stat(ce, &st); - if (!changed && detect_rename < DIFF_DETECT_COPY) + if (!changed && !find_copies_harder) continue; - oldmode = ntohl(ce->ce_mode); show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode), - ce->sha1, null_sha1, + ce->sha1, (changed ? null_sha1 : ce->sha1), ce->name); } diffcore_std((1 < argc) ? argv + 1 : NULL, -- cgit v1.2.1