Merge branch 'nd/misc-cleanups'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 824ecee20b94c471083ad8c7f697b39fbb7cb2b8..558cd34bccf66b1ef4cf9d66bfefe43fae76ceb3 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1015,7 +1015,7 @@ static void add_pbase_object(struct tree_desc *tree,
        while (tree_entry(tree,&entry)) {
                if (S_ISGITLINK(entry.mode))
                        continue;
-               cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 :
+               cmp = tree_entry_len(&entry) != cmplen ? 1 :
                      memcmp(name, entry.path, cmplen);
                if (cmp > 0)
                        continue;