summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-16 00:37:33 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-16 00:37:33 -0700
commit464509f790f409d95e0820364ef7296d82942d8c (patch)
tree5825102bb17963d3890c487d88f6d69703620947 /builtin-apply.c
parent2b6f0b0a78a713be51149f27c2c1172fe4afc9cd (diff)
parentd3e54c88291c2d880ff3a72167c5d3159aed8e97 (diff)
downloadgit-464509f790f409d95e0820364ef7296d82942d8c.tar.gz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: git-bisect: make "start", "good" and "skip" succeed or fail atomically git-am: cope better with an empty Subject: line Ignore leading empty lines while summarizing merges bisect: squelch "fatal: ref HEAD not a symref" misleading message builtin-apply: Show a more descriptive error on failure when opening a patch Clarify documentation of git-cvsserver, particularly in relation to git-shell
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index abe73a0f81..30d26e57b3 100644
--- 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);