[PATCH] Fix git rpull.

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 618fdb6..1186c5c 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -1,7 +1,9 @@
 #include "cache.h"
+#include "diff.h"
 
 static int recursive = 0;
 static int line_termination = '\n';
+static int generate_patch = 0;
 
 // What paths are we interested in?
 static int nr_paths = 0;
@@ -37,7 +39,7 @@ static const unsigned char *extract(void *tree, unsigned long size, const char *
 static char *malloc_base(const char *base, const char *path, int pathlen)
 {
        int baselen = strlen(base);
-       char *newbase = malloc(baselen + pathlen + 2);
+       char *newbase = xmalloc(baselen + pathlen + 2);
        memcpy(newbase, base, baselen);
        memcpy(newbase + baselen, path, pathlen);
        memcpy(newbase + baselen + pathlen, "/", 2);
@@ -79,10 +81,15 @@ static void show_file(const char *prefix, void *tree, unsigned long size, const
                return;
        }
 
-       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);
+       if (generate_patch) {
+               if (!S_ISDIR(mode))
+                       diff_addremove(prefix[0], mode, sha1, base, path);
+       }
+       else
+               printf("%s%06o\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)
@@ -128,11 +135,17 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
                return retval;
        }
 
-       strcpy(old_sha1_hex, sha1_to_hex(sha1));
-       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);
+       if (generate_patch) {
+               if (!S_ISDIR(mode1))
+                       diff_change(mode1, mode2, sha1, sha2, base, path1);
+       }
+       else {
+               strcpy(old_sha1_hex, sha1_to_hex(sha1));
+               printf("*%06o->%06o\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;
 }
 
@@ -225,10 +238,10 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
        unsigned long size1, size2;
        int retval;
 
-       tree1 = read_tree_with_tree_or_commit_sha1(old, &size1, 0);
+       tree1 = read_object_with_reference(old, "tree", &size1, 0);
        if (!tree1)
                die("unable to read source tree (%s)", sha1_to_hex(old));
-       tree2 = read_tree_with_tree_or_commit_sha1(new, &size2, 0);
+       tree2 = read_object_with_reference(new, "tree", &size2, 0);
        if (!tree2)
                die("unable to read destination tree (%s)", sha1_to_hex(new));
        retval = diff_tree(tree1, size1, tree2, size2, base);
@@ -255,6 +268,10 @@ int main(int argc, char **argv)
                        recursive = 1;
                        continue;
                }
+               if (!strcmp(arg, "-p")) {
+                       recursive = generate_patch = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-z")) {
                        line_termination = '\0';
                        continue;
@@ -262,7 +279,7 @@ int main(int argc, char **argv)
                usage(diff_tree_usage);
        }
 
-       if (argc < 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
+       if (argc < 3 || get_sha1(argv[1], old) || get_sha1(argv[2], new))
                usage(diff_tree_usage);
 
        if (argc > 3) {
@@ -270,7 +287,7 @@ int main(int argc, char **argv)
 
                paths = &argv[3];
                nr_paths = argc - 3;
-               pathlens = malloc(nr_paths * sizeof(int));
+               pathlens = xmalloc(nr_paths * sizeof(int));
                for (i=0; i<nr_paths; i++)
                        pathlens[i] = strlen(paths[i]);
        }