Merge branch 'master' of git://github.com/git-l10n/git-po

diff --git a/csum-file.c b/csum-file.c
index b00b215031174a0f8ee3cd3d51c662d3cacc6b00..a172199e44bf370cd66ee7073f5a2228fd9679ef 100644 (file)
--- a/csum-file.c
+++ b/csum-file.c
@@ -130,14 +130,10 @@ struct sha1file *sha1fd_check(const char *name)
 
        sink = open("/dev/null", O_WRONLY);
        if (sink < 0)
-               return NULL;
+               die_errno("unable to open /dev/null");
        check = open(name, O_RDONLY);
-       if (check < 0) {
-               int saved_errno = errno;
-               close(sink);
-               errno = saved_errno;
-               return NULL;
-       }
+       if (check < 0)
+               die_errno("unable to open '%s'", name);
        f = sha1fd(sink, name);
        f->check_fd = check;
        return f;