[PATCH] git-tar-tree: fix write_trailer

[git.git] / diff-files.c

diff --git a/diff-files.c b/diff-files.c
index b840b35..3b05497 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -16,6 +16,7 @@ static int diff_score_opt = 0;
 static const char *pickaxe = NULL;
 static int pickaxe_opts = 0;
 static int diff_break_opt = -1;
+static const char *orderfile = NULL;
 static int silent = 0;
 
 static void show_unmerge(const char *path)
@@ -56,6 +57,8 @@ int main(int argc, const char **argv)
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                else if (!strncmp(argv[1], "-S", 2))
                        pickaxe = argv[1] + 2;
+               else if (!strncmp(argv[1], "-O", 2))
+                       orderfile = argv[1] + 2;
                else if (!strcmp(argv[1], "--pickaxe-all"))
                        pickaxe_opts = DIFF_PICKAXE_ALL;
                else if (!strncmp(argv[1], "-B", 2))
@@ -85,7 +88,7 @@ int main(int argc, const char **argv)
 
        for (i = 0; i < entries; i++) {
                struct stat st;
-               unsigned int oldmode, mode;
+               unsigned int oldmode;
                struct cache_entry *ce = active_cache[i];
                int changed;
 
@@ -113,16 +116,15 @@ int main(int argc, const char **argv)
                        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,
+               show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
+                             ce->sha1, null_sha1,
                              ce->name);
        }
        diffcore_std((1 < argc) ? argv + 1 : NULL,
                     detect_rename, diff_score_opt,
                     pickaxe, pickaxe_opts,
-                    diff_break_opt);
+                    diff_break_opt,
+                    orderfile);
        diff_flush(diff_output_format, 1);
        return 0;
 }