X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-cache.c;h=13baaa37217fd6e1c9313b2989071835c63dbfbd;hb=deb153a75ae1f5eca628a38b911474a69edd242d;hp=3c8f9e0ee97ef678c707ad0d4f4f765ee268f11e;hpb=6b14d7faf0bad026a81a27bac07b47691f621b8f;p=git.git

diff --git a/diff-cache.c b/diff-cache.c
index 3c8f9e0e..13baaa37 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -5,9 +5,13 @@ 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 reverse_diff = 0;
+static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = NULL;
+static const char *diff_filter = NULL;
 
 /* A file entry went away or appeared */
 static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
@@ -154,20 +158,36 @@ 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>";
+"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [--cached] <tree-ish> [<path>...]";
 
 int main(int argc, const char **argv)
 {
-	unsigned char tree_sha1[20];
+	const char *tree_name = NULL;
+	unsigned char sha1[20];
+	const char **pathspec = NULL;
 	void *tree;
 	unsigned long size;
 	int ret;
+	int allow_options = 1;
+	int i;
 
 	read_cache();
-	while (argc > 2) {
-		const char *arg = argv[1];
-		argv++;
-		argc--;
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+
+		if (!allow_options || *arg != '-') {
+			if (tree_name) {
+				pathspec = argv + i;
+				break;
+			}
+			tree_name = arg;
+			continue;
+		}
+			
+		if (!strcmp(arg, "--")) {
+			allow_options = 0;
+			continue;
+		}
 		if (!strcmp(arg, "-r")) {
 			/* We accept the -r flag just to look like git-diff-tree */
 			continue;
@@ -176,14 +196,21 @@ int main(int argc, const char **argv)
 			diff_output_format = DIFF_FORMAT_PATCH;
 			continue;
 		}
+		if (!strncmp(arg, "-B", 2)) {
+			if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+				usage(diff_cache_usage);
+			continue;
+		}
 		if (!strncmp(arg, "-M", 2)) {
 			detect_rename = DIFF_DETECT_RENAME;
-			diff_score_opt = diff_scoreopt_parse(arg);
+			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+				usage(diff_cache_usage);
 			continue;
 		}
 		if (!strncmp(arg, "-C", 2)) {
 			detect_rename = DIFF_DETECT_COPY;
-			diff_score_opt = diff_scoreopt_parse(arg);
+			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+				usage(diff_cache_usage);
 			continue;
 		}
 		if (!strcmp(arg, "-z")) {
@@ -191,13 +218,25 @@ 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, "-S")) {
+		if (!strncmp(arg, "-S", 2)) {
 			pickaxe = arg + 2;
 			continue;
 		}
+		if (!strncmp(arg, "--diff-filter=", 14)) {
+			diff_filter = arg + 14;
+			continue;
+		}
+		if (!strncmp(arg, "-O", 2)) {
+			orderfile = arg + 2;
+			continue;
+		}
+		if (!strcmp(arg, "--pickaxe-all")) {
+			pickaxe_opts = DIFF_PICKAXE_ALL;
+			continue;
+		}
 		if (!strcmp(arg, "-m")) {
 			match_nonexisting = 1;
 			continue;
@@ -209,31 +248,27 @@ int main(int argc, const char **argv)
 		usage(diff_cache_usage);
 	}
 
-	if (argc < 2 || get_sha1(argv[1], tree_sha1))
+	if (!tree_name || get_sha1(tree_name, sha1))
 		usage(diff_cache_usage);
-	argv++;
-	argc--;
 
 	/* The rest is for paths restriction. */
-
-	diff_setup(reverse_diff);
+	diff_setup(diff_setup_opt);
 
 	mark_merge_entries();
 
-	tree = read_object_with_reference(tree_sha1, "tree", &size, NULL);
+	tree = read_object_with_reference(sha1, "tree", &size, NULL);
 	if (!tree)
-		die("bad tree object %s", argv[1]);
+		die("bad tree object %s", tree_name);
 	if (read_tree(tree, size, 1))
-		die("unable to read tree object %s", argv[1]);
+		die("unable to read tree object %s", tree_name);
 
 	ret = diff_cache(active_cache, active_nr);
-	if (detect_rename)
-		diffcore_rename(detect_rename, diff_score_opt);
-	diffcore_prune();
-	if (pickaxe)
-		diffcore_pickaxe(pickaxe);
-	if (2 <= argc)
-		diffcore_pathspec(argv + 1);
+
+	diffcore_std(pathspec ? : NULL,
+		     detect_rename, diff_score_opt,
+		     pickaxe, pickaxe_opts,
+		     diff_break_opt,
+		     orderfile, diff_filter);
 	diff_flush(diff_output_format);
 	return ret;
 }