merge-base: use the new lookup_commit_reference() helper function

diff --git a/diff-tree.c b/diff-tree.c
index 8cfe990023bbae14ff36a23bed1923513a9b022e..59d12f2ba1325bad77dd062936c20cd9cc4d602f 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -54,15 +54,7 @@ static char *malloc_base(const char *base, const char *path, int pathlen)
 }
 
 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
-
-/* A whole sub-tree went away or appeared */
-static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
-{
-       while (size) {
-               show_file(prefix, tree, size, base);
-               update_tree_entry(&tree, &size);
-       }
-}
+static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base);
 
 /* A file entry went away or appeared */
 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
@@ -209,6 +201,13 @@ static int interesting(void *tree, unsigned long size, const char *base)
                if (pathlen > matchlen)
                        continue;
 
+               if (matchlen > pathlen) {
+                       if (match[pathlen] != '/')
+                               continue;
+                       if (!S_ISDIR(mode))
+                               continue;
+               }
+
                if (strncmp(path, match, pathlen))
                        continue;
 
@@ -217,6 +216,16 @@ static int interesting(void *tree, unsigned long size, const char *base)
        return 0; /* No matches */
 }
 
+/* A whole sub-tree went away or appeared */
+static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
+{
+       while (size) {
+               if (interesting(tree, size, base))
+                       show_file(prefix, tree, size, base);
+               update_tree_entry(&tree, &size);
+       }
+}
+
 static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
 {
        while (size1 | size2) {
@@ -356,6 +365,12 @@ static int diff_tree_commit(const unsigned char *commit, const char *name)
                        return 0;
        }
 
+       if (!name) {
+               static char commit_name[60];
+               strcpy(commit_name, sha1_to_hex(commit));
+               name = commit_name;
+       }
+
        offset = 46;
        while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
                unsigned char parent[20];
@@ -472,7 +487,7 @@ int main(int argc, char **argv)
                        usage(diff_tree_usage);
                break;
        case 1:
-               diff_tree_commit(sha1[0], sha1_to_hex(sha1[0]));
+               diff_tree_commit(sha1[0], NULL);
                break;
        case 2:
                diff_tree_sha1(sha1[0], sha1[1], "");