diff --git a/builtin-grep.c b/builtin-grep.c
index 9343cc5e5dc66e6e47b15d49de71df39a24050bf..f477659100fdc63bff5938b4c96f28eaefc07460 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
argc -= 2;
}
- if (opt->pre_context || opt->post_context || opt->funcname) {
+ if (opt->pre_context || opt->post_context) {
/*
* grep handles hunk marks between files, but we need to
* do that ourselves between multiple calls.
*/
if (opt->show_hunk_mark)
- write_or_die(1, opt->funcname ? "==\n" : "--\n", 3);
+ write_or_die(1, "--\n", 3);
else
opt->show_hunk_mark = 1;
}
patterns = fopen(arg, "r");
if (!patterns)
- die("'%s': %s", arg, strerror(errno));
+ die_errno("cannot open '%s'", arg);
while (strbuf_getline(&sb, patterns, '\n') == 0) {
/* ignore empty line like grep does */
if (sb.len == 0)