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

diff --git a/diff-cache.c b/diff-cache.c
index be922228..e3c4c815 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -2,7 +2,8 @@
 #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;
@@ -87,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 */
@@ -130,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.
@@ -222,17 +227,13 @@ int main(int argc, const char **argv)
 			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, "--name-only-z")) {
-			diff_output_format = DIFF_FORMAT_NAME_Z;
-			continue;
-		}
 		if (!strcmp(arg, "-R")) {
 			diff_setup_opt |= DIFF_SETUP_REVERSE;
 			continue;
@@ -281,13 +282,13 @@ int main(int argc, const char **argv)
 	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_break_opt,
 		     orderfile, diff_filter);
-	diff_flush(diff_output_format);
+	diff_flush(diff_output_format, diff_line_termination);
 	return ret;
 }