summaryrefslogtreecommitdiff
path: root/diff-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-22 17:04:37 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-22 17:17:50 (GMT)
commit6b14d7faf0bad026a81a27bac07b47691f621b8f (patch)
treeb9d1923aaaea706179e9b27e07a843d277ad1bee /diff-cache.c
parent26dee0adfcfa6fc15a522d32765eabbe4f295237 (diff)
downloadgit-6b14d7faf0bad026a81a27bac07b47691f621b8f.zip
git-6b14d7faf0bad026a81a27bac07b47691f621b8f.tar.gz
git-6b14d7faf0bad026a81a27bac07b47691f621b8f.tar.bz2
[PATCH] Diffcore updates.
This moves the path selection logic from individual programs to a new diffcore transformer (diff-tree still needs to have its own for performance reasons). Also the header printing code in diff-tree was tweaked not to produce anything when pickaxe is in effect and there is nothing interesting to report. An interesting example is the following in the GIT archive itself: $ git-whatchanged -p -C -S'or something in a real script' 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.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/diff-cache.c b/diff-cache.c
index 54691a9..3c8f9e0 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -71,7 +71,7 @@ static int show_modified(struct cache_entry *old,
oldmode = old->ce_mode;
if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
- detect_rename < 2)
+ detect_rename < DIFF_DETECT_COPY)
return 0;
mode = ntohl(mode);
@@ -156,7 +156,7 @@ static void mark_merge_entries(void)
static char *diff_cache_usage =
"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>";
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
unsigned char tree_sha1[20];
void *tree;
@@ -165,7 +165,7 @@ int main(int argc, char **argv)
read_cache();
while (argc > 2) {
- char *arg = argv[1];
+ const char *arg = argv[1];
argv++;
argc--;
if (!strcmp(arg, "-r")) {
@@ -177,12 +177,12 @@ int main(int argc, char **argv)
continue;
}
if (!strncmp(arg, "-M", 2)) {
- detect_rename = 1;
+ detect_rename = DIFF_DETECT_RENAME;
diff_score_opt = diff_scoreopt_parse(arg);
continue;
}
if (!strncmp(arg, "-C", 2)) {
- detect_rename = 2;
+ detect_rename = DIFF_DETECT_COPY;
diff_score_opt = diff_scoreopt_parse(arg);
continue;
}
@@ -209,10 +209,14 @@ int main(int argc, char **argv)
usage(diff_cache_usage);
}
- if (argc != 2 || get_sha1(argv[1], tree_sha1))
+ if (argc < 2 || get_sha1(argv[1], tree_sha1))
usage(diff_cache_usage);
+ argv++;
+ argc--;
- diff_setup(reverse_diff, diff_output_format);
+ /* The rest is for paths restriction. */
+
+ diff_setup(reverse_diff);
mark_merge_entries();
@@ -224,9 +228,12 @@ int main(int argc, char **argv)
ret = diff_cache(active_cache, active_nr);
if (detect_rename)
- diff_detect_rename(detect_rename, diff_score_opt);
+ diffcore_rename(detect_rename, diff_score_opt);
+ diffcore_prune();
if (pickaxe)
- diff_pickaxe(pickaxe);
- diff_flush(NULL, 0);
+ diffcore_pickaxe(pickaxe);
+ if (2 <= argc)
+ diffcore_pathspec(argv + 1);
+ diff_flush(diff_output_format);
return ret;
}