X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=diff-cache.c;h=33b3b3177990a42f06cf2e5723f22188f993ae30;hb=d6d8dac032e0e0c55b3edffbefd0abb00ca960fc;hp=66e7bdb62e80f7dd114c72171842691c3a237df7;hpb=6145ee8b361959db04b8cdefc883e4fc2dc27276;p=git.git

diff --git a/diff-cache.c b/diff-cache.c
index 66e7bdb6..33b3b317 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -5,10 +5,14 @@ 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;
 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)
@@ -72,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);
@@ -155,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>] [--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)
 {
@@ -165,13 +169,14 @@ int main(int argc, const char **argv)
 	void *tree;
 	unsigned long size;
 	int ret;
+	int allow_options = 1;
 	int i;
 
 	read_cache();
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
-		if (*arg != '-') {
+		if (!allow_options || *arg != '-') {
 			if (tree_name) {
 				pathspec = argv + i;
 				break;
@@ -180,22 +185,38 @@ int main(int argc, const char **argv)
 			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")) {
+		/* We accept the -u flag as a synonym for "-p" */
+		if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
 			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, "--find-copies-harder")) {
+			find_copies_harder = 1;
 			continue;
 		}
 		if (!strcmp(arg, "-z")) {
@@ -206,10 +227,18 @@ int main(int argc, const char **argv)
 			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;
@@ -225,6 +254,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);
 
@@ -240,12 +272,12 @@ int main(int argc, const char **argv)
 		die("unable to read tree object %s", tree_name);
 
 	ret = diff_cache(active_cache, active_nr);
-	if (pathspec)
-		diffcore_pathspec(pathspec);
-	if (detect_rename)
-		diffcore_rename(detect_rename, diff_score_opt);
-	if (pickaxe)
-		diffcore_pickaxe(pickaxe, pickaxe_opts);
-	diff_flush(diff_output_format, 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;
 }