X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=39dd54f80a7e81f7e67faf13ba79a0a8c9e077e7;hb=7a868a84143c0bad2dce3fd0337320524436da27;hp=ebaf235c52f570c3bbe90bbfd4ad7d9e805f476f;hpb=dda2d79af2d2858b37bab7f6e088d0730c0959d1;p=git.git

diff --git a/diff-files.c b/diff-files.c
index ebaf235c..39dd54f8 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -11,7 +11,8 @@ static const char *diff_files_usage =
 "[<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 static int detect_rename = 0;
 static int find_copies_harder = 0;
 static int diff_setup_opt = 0;
@@ -43,6 +44,7 @@ static void show_modified(int oldmode, int mode,
 int main(int argc, const char **argv)
 {
 	static const unsigned char null_sha1[20] = { 0, };
+	const char **pathspec;
 	int entries = read_cache();
 	int i;
 
@@ -56,11 +58,9 @@ int main(int argc, const char **argv)
 		else if (!strcmp(argv[1], "-s"))
 			; /* no-op */
 		else if (!strcmp(argv[1], "-z"))
-			diff_output_format = DIFF_FORMAT_MACHINE;
+			diff_line_termination = 0;
 		else if (!strcmp(argv[1], "--name-only"))
 			diff_output_format = DIFF_FORMAT_NAME;
-		else if (!strcmp(argv[1], "--name-only-z"))
-			diff_output_format = DIFF_FORMAT_NAME_Z;
 		else if (!strcmp(argv[1], "-R"))
 			diff_setup_opt |= DIFF_SETUP_REVERSE;
 		else if (!strncmp(argv[1], "-S", 2))
@@ -95,6 +95,9 @@ int main(int argc, const char **argv)
 		argv++; argc--;
 	}
 
+	/* Do we have a pathspec? */
+	pathspec = (argc > 1) ? argv + 1 : NULL;
+
 	if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
 		usage(diff_files_usage);
 
@@ -114,6 +117,9 @@ int main(int argc, const char **argv)
 		struct cache_entry *ce = active_cache[i];
 		int changed;
 
+		if (!ce_path_match(ce, pathspec))
+			continue;
+
 		if (ce_stage(ce)) {
 			show_unmerge(ce->name);
 			while (i < entries &&
@@ -141,11 +147,11 @@ int main(int argc, const char **argv)
 			      ce->sha1, (changed ? null_sha1 : ce->sha1),
 			      ce->name);
 	}
-	diffcore_std((1 < argc) ? argv + 1 : NULL,
+	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 0;
 }