Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

[thirdparty/git.git] / xdiff-interface.c

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 060038c2d6b92512e6625d0f5d94ed5439cd249c..018e03308921e3b44bb75b8bc1e005424ca4fc1b 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "xdiff-interface.h"
 #include "xdiff/xtypes.h"
 #include "xdiff/xdiffi.h"
@@ -164,9 +165,9 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
        size_t sz;
 
        if (stat(filename, &st))
-               return error("Could not stat %s", filename);
+               return error_errno("Could not stat %s", filename);
        if ((f = fopen(filename, "rb")) == NULL)
-               return error("Could not open %s", filename);
+               return error_errno("Could not open %s", filename);
        sz = xsize_t(st.st_size);
        ptr->ptr = xmalloc(sz ? sz : 1);
        if (sz && fread(ptr->ptr, sz, 1, f) != 1) {