Merge branch 'jk/xstrfmt'

diff --git a/unpack-trees.c b/unpack-trees.c
index c237370b1f705e2e4aa4b51b8635dd50e7b8d013..0ac39e93a08733ee46f42dfa1170af7333ae43e5 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -617,17 +617,6 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message)
        return -1;
 }
 
-/* NEEDSWORK: give this a better name and share with tree-walk.c */
-static int name_compare(const char *a, int a_len,
-                       const char *b, int b_len)
-{
-       int len = (a_len < b_len) ? a_len : b_len;
-       int cmp = memcmp(a, b, len);
-       if (cmp)
-               return cmp;
-       return (a_len - b_len);
-}
-
 /*
  * The tree traversal is looking at name p.  If we have a matching entry,
  * return it.  If name p is a directory in the index, do not return