[PATCH] Make do_each_ref() follow symlinks.

diff --git a/diff-cache.c b/diff-cache.c
index 37c6eb5804ec7a454b0df83809e0208bcbd1b766..47a4e09ecc99727c7c711a121cbd4d04892484ac 100644 (file)
--- 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,28 +88,6 @@ static int show_modified(struct cache_entry *old,
        return 0;
 }
 
-static int ce_path_match(const struct cache_entry *ce, const char **pathspec)
-{
-       const char *match, *name;
-       int len;
-
-       if (!pathspec)
-               return 1;
-
-       len = ce_namelen(ce);
-       name = ce->name;
-       while ((match = *pathspec++) != NULL) {
-               int matchlen = strlen(match);
-               if (matchlen > len)
-                       continue;
-               if (memcmp(name, match, matchlen))
-                       continue;
-               if (name[matchlen] == '/' || !name[matchlen])
-                       return 1;
-       }
-       return 0;
-}
-
 static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
 {
        while (entries) {
@@ -184,7 +163,7 @@ static void mark_merge_entries(void)
        }
 }
 
-static char *diff_cache_usage =
+static const char diff_cache_usage[] =
 "git-diff-cache [-m] [--cached] "
 "[<common diff options>] <tree-ish> [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
@@ -248,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;
@@ -314,6 +289,6 @@ int main(int argc, const char **argv)
                     pickaxe, pickaxe_opts,
                     diff_break_opt,
                     orderfile, diff_filter);
-       diff_flush(diff_output_format);
+       diff_flush(diff_output_format, diff_line_termination);
        return ret;
 }