X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=17899390b80f4bfc03718e92029b5c4de65055b6;hb=69779a562a171d9b70bbb17b89e076bd6b16ae6c;hp=fb345a5161c2a49ea36f697197fde057248b687b;hpb=667bb59b2d5b0a2e7fca5970d6f757790a6edd74;p=git.git

diff --git a/diff-files.c b/diff-files.c
index fb345a51..17899390 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -6,88 +6,76 @@
 #include "cache.h"
 #include "diff.h"
 
-static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-M] [paths...]";
+static const char diff_files_usage[] =
+"git-diff-files [-q] "
+"[<common diff options>] [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
-static int generate_patch = 0;
-static int line_termination = '\n';
-static int detect_rename = 0;
+static struct diff_options diff_options;
 static int silent = 0;
 
-static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
-{
-	int i;
-	int namelen = ce_namelen(ce);
-	for (i = 0; i < cnt; i++) {
-		int speclen = strlen(spec[i]);
-		if (! strncmp(spec[i], ce->name, speclen) &&
-		    speclen <= namelen &&
-		    (ce->name[speclen] == 0 ||
-		     ce->name[speclen] == '/'))
-			return 1;
-	}
-	return 0;
-}
-
 static void show_unmerge(const char *path)
 {
-	if (generate_patch)
-		diff_unmerge(path);
-	else
-		printf("U %s%c", path, line_termination);
+	diff_unmerge(&diff_options, path);
 }
 
 static void show_file(int pfx, struct cache_entry *ce)
 {
-	if (generate_patch)
-		diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1,
-			       ce->name, NULL);
-	else
-		printf("%c%06o\t%s\t%s\t%s%c",
-		       pfx, ntohl(ce->ce_mode), "blob",
-		       sha1_to_hex(ce->sha1), ce->name, line_termination);
+	diff_addremove(&diff_options, pfx, ntohl(ce->ce_mode),
+		       ce->sha1, ce->name, NULL);
 }
 
 static void show_modified(int oldmode, int mode,
 			  const unsigned char *old_sha1, const unsigned char *sha1,
 			  char *path)
 {
-	char old_sha1_hex[41];
-	strcpy(old_sha1_hex, sha1_to_hex(old_sha1));
-
-	if (generate_patch)
-		diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
-	else
-		printf("*%06o->%06o\tblob\t%s->%s\t%s%c",
-		       oldmode, mode, old_sha1_hex, sha1_to_hex(sha1), path,
-		       line_termination);
+	diff_change(&diff_options, oldmode, mode, old_sha1, sha1, path, NULL);
 }
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
-	static const unsigned char null_sha1[20] = { 0, };
-	int entries = read_cache();
-	int i;
+	const char **pathspec;
+	const char *prefix = setup_git_directory();
+	int entries, i;
 
+	git_config(git_default_config);
+	diff_setup(&diff_options);
 	while (1 < argc && argv[1][0] == '-') {
-		if (!strcmp(argv[1], "-p"))
-			generate_patch = 1;
-		else if (!strcmp(argv[1], "-q"))
+		if (!strcmp(argv[1], "--")) {
+			argv++;
+			argc--;
+			break;
+		}
+		if (!strcmp(argv[1], "-q"))
 			silent = 1;
 		else if (!strcmp(argv[1], "-r"))
 			; /* no-op */
 		else if (!strcmp(argv[1], "-s"))
 			; /* no-op */
-		else if (!strcmp(argv[1], "-z"))
-			line_termination = 0;
-		else if (!strcmp(argv[1], "-M")) {
-			detect_rename = generate_patch = 1;
+		else {
+			int diff_opt_cnt;
+			diff_opt_cnt = diff_opt_parse(&diff_options,
+						      argv+1, argc-1);
+			if (diff_opt_cnt < 0)
+				usage(diff_files_usage);
+			else if (diff_opt_cnt) {
+				argv += diff_opt_cnt;
+				argc -= diff_opt_cnt;
+				continue;
+			}
+			else
+				usage(diff_files_usage);
 		}
-		else
-			usage(diff_files_usage);
 		argv++; argc--;
 	}
 
+	/* Find the directory, and set up the pathspec */
+	pathspec = get_pathspec(prefix, argv + 1);
+	entries = read_cache();
+
+	if (diff_setup_done(&diff_options) < 0)
+		usage(diff_files_usage);
+
 	/* At this point, if argc == 1, then we are doing everything.
 	 * Otherwise argv[1] .. argv[argc-1] have the explicit paths.
 	 */
@@ -96,17 +84,13 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (generate_patch)
-		diff_setup(detect_rename, 0, 0, 0, 0);		
-
 	for (i = 0; i < entries; i++) {
 		struct stat st;
-		unsigned int oldmode, mode;
+		unsigned int oldmode, newmode;
 		struct cache_entry *ce = active_cache[i];
 		int changed;
 
-		if (1 < argc &&
-		    ! matches_pathspec(ce, argv+1, argc-1))
+		if (!ce_path_match(ce, pathspec))
 			continue;
 
 		if (ce_stage(ce)) {
@@ -117,29 +101,32 @@ int main(int argc, char **argv)
 			i--; /* compensate for loop control increments */
 			continue;
 		}
- 
+
 		if (lstat(ce->name, &st) < 0) {
-			if (errno != ENOENT) {
+			if (errno != ENOENT && errno != ENOTDIR) {
 				perror(ce->name);
 				continue;
-			}	
+			}
 			if (silent)
 				continue;
 			show_file('-', ce);
 			continue;
 		}
 		changed = ce_match_stat(ce, &st);
-		if (!changed)
+		if (!changed && !diff_options.find_copies_harder)
 			continue;
-
 		oldmode = ntohl(ce->ce_mode);
-		mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
-			S_IFREG | ce_permissions(st.st_mode));
 
-		show_modified(oldmode, mode, ce->sha1, null_sha1,
+		newmode = DIFF_FILE_CANON_MODE(st.st_mode);
+		if (!trust_executable_bit &&
+		    S_ISREG(newmode) && S_ISREG(oldmode) &&
+		    ((newmode ^ oldmode) == 0111))
+			newmode = oldmode;
+		show_modified(oldmode, newmode,
+			      ce->sha1, (changed ? null_sha1 : ce->sha1),
 			      ce->name);
 	}
-	if (generate_patch)
-		diff_flush();
+	diffcore_std(&diff_options);
+	diff_flush(&diff_options);
 	return 0;
 }