[PATCH] diff-tree-helper: do not report unmerged path outside specification.

diff --git a/show-files.c b/show-files.c
index b1a8e3dd5556b61dd771d32307c6ee5d7150fa43..afeb6356730e404320351022c29b6335bf366007 100644 (file)
--- a/show-files.c
+++ b/show-files.c
@@ -6,7 +6,6 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include <dirent.h>
-#include <sys/param.h>
 
 #include "cache.h"
 
@@ -31,9 +30,9 @@ static void add_name(const char *pathname, int len)
 
        if (nr_dir == dir_alloc) {
                dir_alloc = alloc_nr(dir_alloc);
-               dir = realloc(dir, dir_alloc*sizeof(char *));
+               dir = xrealloc(dir, dir_alloc*sizeof(char *));
        }
-       name = malloc(len + 1);
+       name = xmalloc(len + 1);
        memcpy(name, pathname, len + 1);
        dir[nr_dir++] = name;
 }