diff-tree: fix up comparison of "interesting" sub-trees

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 8cfe990..3bc7480 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -209,6 +209,11 @@ static int interesting(void *tree, unsigned long size, const char *base)
                if (pathlen > matchlen)
                        continue;
 
+               if (matchlen > pathlen) {
+                       if (match[pathlen] != '/')
+                               continue;
+               }
+
                if (strncmp(path, match, pathlen))
                        continue;
 
@@ -356,6 +361,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 +483,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], "");