Merge branch 'maint-1.5.4' into maint

[git.git] / builtin-apply.c

diff --git a/builtin-apply.c b/builtin-apply.c
index abe73a0f8194e95c2a10a27c2007560e6d57f3d5..30d26e57b30821d6b11efe4f493da6d35fb1dc18 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -3121,7 +3121,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);