diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-16 00:45:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-16 00:45:52 -0700 |
| commit | a17b1d2f0b3128be6f116bf22b58244b310d27b9 (patch) | |
| tree | 6c1fc3fe2a6630902bbd37f45d3e94437a5039b2 /builtin-apply.c | |
| parent | 189d6b8bfae62ab0c0bc62877ba97d6d88ae1595 (diff) | |
| parent | 464509f790f409d95e0820364ef7296d82942d8c (diff) | |
| download | git-a17b1d2f0b3128be6f116bf22b58244b310d27b9.tar.gz git-a17b1d2f0b3128be6f116bf22b58244b310d27b9.tar.xz | |
Merge branch 'maint'
* maint:
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index c8ca41b68..caa3f2aa0 100644 --- 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); |