Merge branch 'maint'

diff --git a/builtin-apply.c b/builtin-apply.c
index c8ca41b68f8febb4856e3d6cc9a0ebef0a0a9973..caa3f2aa0ca147091d28013c3d2c11346e350675 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -3117,7 +3117,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
 
                fd = open(arg, O_RDONLY);
                if (fd < 0)
-                       usage(apply_usage);
+                       die("can't open patch '%s': %s", arg, strerror(errno));
                read_stdin = 0;
                set_default_whitespace_mode(whitespace_option);
                errs |= apply_patch(fd, arg, inaccurate_eof);