X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-cache.c;h=e3c4c8155caeb8023e022194d828d9e515a2326d;hb=ec3f5a46eae8dd36995ff4709360417b55bc2d7d;hp=c097826719e4007122276a569db9f3732ee64f07;hpb=befe86392c767b62e4a6498cf951faae6f2c5ea3;p=git.git

diff --git a/diff-cache.c b/diff-cache.c
index c0978267..e3c4c815 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -2,13 +2,18 @@
 #include "diff.h"
 
 static int cached_only = 0;
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 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 +77,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);
@@ -83,12 +88,15 @@ static int show_modified(struct cache_entry *old,
 	return 0;
 }
 
-static int diff_cache(struct cache_entry **ac, int entries)
+static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
 {
 	while (entries) {
 		struct cache_entry *ce = *ac;
 		int same = (entries > 1) && ce_same_name(ce, ac[1]);
 
+		if (!ce_path_match(ce, pathspec))
+			goto skip_entry;
+
 		switch (ce_stage(ce)) {
 		case 0:
 			/* No stage 1 entry? That means it's a new file */
@@ -126,6 +134,7 @@ static int diff_cache(struct cache_entry **ac, int entries)
 			die("impossible cache entry stage");
 		}
 
+skip_entry:
 		/*
 		 * Ignore all the different stages for this file,
 		 * we've handled the relevant cases now.
@@ -155,7 +164,9 @@ 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 [-m] [--cached] "
+"[<common diff options>] <tree-ish> [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)
 {
@@ -165,13 +176,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,26 +192,46 @@ 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")) {
-			diff_output_format = DIFF_FORMAT_MACHINE;
+			diff_line_termination = 0;
+			continue;
+		}
+		if (!strcmp(arg, "--name-only")) {
+			diff_output_format = DIFF_FORMAT_NAME;
 			continue;
 		}
 		if (!strcmp(arg, "-R")) {
@@ -210,6 +242,14 @@ int main(int argc, const char **argv)
 			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 +265,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);
 
@@ -236,13 +279,16 @@ int main(int argc, const char **argv)
 	tree = read_object_with_reference(sha1, "tree", &size, NULL);
 	if (!tree)
 		die("bad tree object %s", tree_name);
-	if (read_tree(tree, size, 1))
+	if (read_tree(tree, size, 1, pathspec))
 		die("unable to read tree object %s", tree_name);
 
-	ret = diff_cache(active_cache, active_nr);
+	ret = diff_cache(active_cache, active_nr, pathspec);
+
 	diffcore_std(pathspec,
 		     detect_rename, diff_score_opt,
-		     pickaxe, pickaxe_opts);
-	diff_flush(diff_output_format, 1);
+		     pickaxe, pickaxe_opts,
+		     diff_break_opt,
+		     orderfile, diff_filter);
+	diff_flush(diff_output_format, diff_line_termination);
 	return ret;
 }