From: Alberto Bertogli <albertito@gmail.com>
Date: Mon, 14 Apr 2008 15:30:27 +0000 (-0300)
Subject: builtin-apply: Show a more descriptive error on failure when opening a patch
X-Git-Tag: v1.5.5.1~7^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1da16439bece6b90e1ce033bc50c5316f2c5dac2;p=git.git

builtin-apply: Show a more descriptive error on failure when opening a patch

When a patch can't be opened (it doesn't exist, there are permission
problems, etc.) we get the usage text, which is not a proper indication of
failure.

Signed-off-by: Alberto Bertogli <albertito@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-apply.c b/builtin-apply.c
index 03f2e950b..65388353a 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2888,7 +2888,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);