[PATCH] Fix +x-related show-diff false positives

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 5cf6057..826812a 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 
 static int recursive = 0;
+static int line_termination = '\n';
 
 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
 
@@ -11,7 +12,7 @@ static void update_tree_entry(void **bufp, unsigned long *sizep)
        int len = strlen(buf) + 1 + 20;
 
        if (size < len)
-               usage("corrupt tree file");
+               die("corrupt tree file");
        *bufp = buf + len;
        *sizep = size - len;
 }
@@ -23,7 +24,7 @@ static const unsigned char *extract(void *tree, unsigned long size, const char *
        const char *path = strchr(tree, ' ');
 
        if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
-               usage("corrupt tree file");
+               die("corrupt tree file");
        *pathp = path+1;
        return sha1;
 }
@@ -64,7 +65,7 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
 
                tree = read_sha1_file(sha1, type, &size);
                if (!tree || strcmp(type, "tree"))
-                       usage("corrupt tree sha %s", sha1_to_hex(sha1));
+                       die("corrupt tree sha %s", sha1_to_hex(sha1));
 
                show_tree(prefix, tree, size, newbase);
                
@@ -73,7 +74,10 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
                return;
        }
 
-       printf("%s%o %s %s%s%c", prefix, mode, sha1_to_hex(sha1), base, path, 0);
+       printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
+              S_ISDIR(mode) ? "tree" : "blob",
+              sha1_to_hex(sha1), base, path,
+              line_termination);
 }
 
 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@ -103,7 +107,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
 
        /*
         * If the filemode has changed to/from a directory from/to a regular
-        * file, we need to consider it a remove and an add. 
+        * file, we need to consider it a remove and an add.
         */
        if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
                show_file("-", tree1, size1, base);
@@ -120,7 +124,10 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
        }
 
        strcpy(old_sha1_hex, sha1_to_hex(sha1));
-       printf("*%o->%o %s->%s %s%s%c", mode1, mode2, old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
+       printf("*%o->%o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
+              S_ISDIR(mode1) ? "tree" : "blob",
+              old_sha1_hex, sha1_to_hex(sha2), base, path1,
+              line_termination);
        return 0;
 }
 
@@ -148,7 +155,7 @@ static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned lon
                        update_tree_entry(&tree2, &size2);
                        continue;
                }
-               usage("diff-tree: internal error");
+               die("diff-tree: internal error");
        }
        return 0;
 }
@@ -162,10 +169,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
 
        tree1 = read_sha1_file(old, type, &size1);
        if (!tree1 || strcmp(type, "tree"))
-               usage("unable to read source tree");
+               die("unable to read source tree (%s)", sha1_to_hex(old));
        tree2 = read_sha1_file(new, type, &size2);
        if (!tree2 || strcmp(type, "tree"))
-               usage("unable to read destination tree");
+               die("unable to read destination tree (%s)", sha1_to_hex(new));
        retval = diff_tree(tree1, size1, tree2, size2, base);
        free(tree1);
        free(tree2);
@@ -180,11 +187,15 @@ int main(int argc, char **argv)
                char *arg = argv[1];
                argv++;
                argc--;
-               if (!strcmp(arg, "-R")) {
+               if (!strcmp(arg, "-r")) {
                        recursive = 1;
                        continue;
                }
-               usage("diff-tree [-R] <tree sha1> <tree sha1>");
+               if (!strcmp(arg, "-z")) {
+                       line_termination = '\0';
+                       continue;
+               }
+               usage("diff-tree [-r] [-z] <tree sha1> <tree sha1>");
        }
 
        if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))