X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-cache.c;h=1d355aa028f2521e8da5b77d14f35bd26eaaa3e4;hb=17ebe977d72290dcdc848b78ae2e65b59d4e1b4c;hp=b47b45a40d277a1211e56de0adfb6753ec34fb02;hpb=c3e7fbcbd0561cd13abc8cefcea3e09ab6090d50;p=git.git

diff --git a/diff-cache.c b/diff-cache.c
index b47b45a4..1d355aa0 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -2,13 +2,15 @@
 #include "diff.h"
 
 static int cached_only = 0;
-static int generate_patch = 0;
+static int diff_output_format = DIFF_FORMAT_HUMAN;
 static int match_nonexisting = 0;
-static int line_termination = '\n';
 static int detect_rename = 0;
-static int reverse_diff = 0;
+static int diff_setup_opt = 0;
 static int diff_score_opt = 0;
-static char *pickaxe = 0;
+static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = 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)
@@ -72,7 +74,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);
@@ -155,51 +157,81 @@ 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, char **argv)
+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) {
-		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;
 		}
 		if (!strcmp(arg, "-p")) {
-			generate_patch = 1;
+			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)) {
-			generate_patch = detect_rename = 1;
-			diff_score_opt = diff_scoreopt_parse(arg);
+			detect_rename = DIFF_DETECT_RENAME;
+			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+				usage(diff_cache_usage);
 			continue;
 		}
 		if (!strncmp(arg, "-C", 2)) {
-			generate_patch = 1;
-			detect_rename = 2;
-			diff_score_opt = diff_scoreopt_parse(arg);
+			detect_rename = DIFF_DETECT_COPY;
+			if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+				usage(diff_cache_usage);
 			continue;
 		}
 		if (!strcmp(arg, "-z")) {
-			line_termination = '\0';
+			diff_output_format = DIFF_FORMAT_MACHINE;
 			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, "-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;
@@ -211,22 +243,27 @@ int main(int argc, 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);
 
-	diff_setup(detect_rename, diff_score_opt, pickaxe,
-		   reverse_diff, (generate_patch ? -1 : line_termination),
-		   NULL, 0);
+	/* The rest is for paths restriction. */
+	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);
-	diff_flush();
+
+	diffcore_std(pathspec ? : NULL,
+		     detect_rename, diff_score_opt,
+		     pickaxe, pickaxe_opts,
+		     diff_break_opt,
+		     orderfile);
+	diff_flush(diff_output_format, 1);
 	return ret;
 }