Merge branch 'mh/avoid-rewriting-packed-refs' into maint

diff --git a/path.c b/path.c
index 2e09a7bce0688acccaca8b980c2c337a71885966..da8b655730d363dda5010bdf2d53bd76abb82931 100644 (file)
--- a/path.c
+++ b/path.c
@@ -192,7 +192,7 @@ static void *add_to_trie(struct trie *root, const char *key, void *value)
                 * Split this node: child will contain this node's
                 * existing children.
                 */
-               child = malloc(sizeof(*child));
+               child = xmalloc(sizeof(*child));
                memcpy(child->children, root->children, sizeof(root->children));
 
                child->len = root->len - i - 1;