diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-06-19 13:14:05 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 20:13:18 -0700 |
| commit | 4727f640036fbdad414bdcbe31d08f6a8fd70923 (patch) | |
| tree | 5458d4661aed71ae5864f663f636cf9707e43e9e /diff-cache.c | |
| parent | Make "git commit" clean up after itself (diff) | |
| download | tgif-4727f640036fbdad414bdcbe31d08f6a8fd70923.tar.xz | |
[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-cache.c')
| -rw-r--r-- | diff-cache.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/diff-cache.c b/diff-cache.c index 13baaa3721..603a6b7774 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -5,6 +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 find_copies_harder = 0; static int diff_setup_opt = 0; static int diff_score_opt = 0; static const char *pickaxe = NULL; @@ -75,7 +76,7 @@ static int show_modified(struct cache_entry *old, oldmode = old->ce_mode; if (mode == oldmode && !memcmp(sha1, old->sha1, 20) && - detect_rename < DIFF_DETECT_COPY) + !find_copies_harder) return 0; mode = ntohl(mode); @@ -158,7 +159,7 @@ static void mark_merge_entries(void) } static char *diff_cache_usage = -"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [--cached] <tree-ish> [<path>...]"; +"git-diff-cache [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> [<path>...]"; int main(int argc, const char **argv) { @@ -213,6 +214,10 @@ int main(int argc, const char **argv) usage(diff_cache_usage); continue; } + if (!strcmp(arg, "--find-copies-harder")) { + find_copies_harder = 1; + continue; + } if (!strcmp(arg, "-z")) { diff_output_format = DIFF_FORMAT_MACHINE; continue; @@ -248,6 +253,9 @@ int main(int argc, const char **argv) usage(diff_cache_usage); } + if (find_copies_harder && detect_rename != DIFF_DETECT_COPY) + usage(diff_cache_usage); + if (!tree_name || get_sha1(tree_name, sha1)) usage(diff_cache_usage); |