Implement a test for git-fetch-pack/git-upload-pack

[git.git] / diff-files.c

diff --git a/diff-files.c b/diff-files.c
index 17c328a..1789939 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -6,67 +6,76 @@
 #include "cache.h"
 #include "diff.h"
 
-static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [paths...]";
+static const char diff_files_usage[] =
+"git-diff-files [-q] "
+"[<common diff options>] [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
-static int diff_output_format = DIFF_FORMAT_HUMAN;
-static int detect_rename = 0;
-static int reverse_diff = 0;
-static int diff_score_opt = 0;
-static const char *pickaxe = NULL;
+static struct diff_options diff_options;
 static int silent = 0;
 
 static void show_unmerge(const char *path)
 {
-       diff_unmerge(path);
+       diff_unmerge(&diff_options, path);
 }
 
 static void show_file(int pfx, struct cache_entry *ce)
 {
-       diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
+       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)
 {
-       diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
+       diff_change(&diff_options, oldmode, mode, old_sha1, sha1, path, NULL);
 }
 
 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"))
-                       diff_output_format = DIFF_FORMAT_PATCH;
-               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"))
-                       diff_output_format = DIFF_FORMAT_MACHINE;
-               else if (!strcmp(argv[1], "-R"))
-                       reverse_diff = 1;
-               else if (!strcmp(argv[1], "-S"))
-                       pickaxe = argv[1] + 2;
-               else if (!strncmp(argv[1], "-M", 2)) {
-                       diff_score_opt = diff_scoreopt_parse(argv[1]);
-                       detect_rename = DIFF_DETECT_RENAME;
-               }
-               else if (!strncmp(argv[1], "-C", 2)) {
-                       diff_score_opt = diff_scoreopt_parse(argv[1]);
-                       detect_rename = DIFF_DETECT_COPY;
+               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.
         */
@@ -75,14 +84,15 @@ int main(int argc, const char **argv)
                exit(1);
        }
 
-       diff_setup(reverse_diff);
-
        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 (!ce_path_match(ce, pathspec))
+                       continue;
+
                if (ce_stage(ce)) {
                        show_unmerge(ce->name);
                        while (i < entries &&
@@ -103,23 +113,20 @@ int main(int argc, const char **argv)
                        continue;
                }
                changed = ce_match_stat(ce, &st);
-               if (!changed && detect_rename < DIFF_DETECT_COPY)
+               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 (detect_rename)
-               diffcore_rename(detect_rename, diff_score_opt);
-       diffcore_prune();
-       if (pickaxe)
-               diffcore_pickaxe(pickaxe);
-       if (1 < argc)
-               diffcore_pathspec(argv + 1);
-       diff_flush(diff_output_format, 1);
+       diffcore_std(&diff_options);
+       diff_flush(&diff_options);
        return 0;
 }