summaryrefslogtreecommitdiffstats
path: root/grep.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-20 05:14:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-20 05:14:36 +0000
commit09f61306ecfdf0e532c58460d8d868d50021e7db (patch)
treeb6f46cb23ce41cddcb6e1320d5c1c4bd5d69e899 /grep.c
parentAdding debian version 1:2.43.0-1. (diff)
downloadgit-09f61306ecfdf0e532c58460d8d868d50021e7db.tar.xz
git-09f61306ecfdf0e532c58460d8d868d50021e7db.zip
Merging upstream version 1:2.45.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/grep.c b/grep.c
index fc2d0c8..ac34bfe 100644
--- a/grep.c
+++ b/grep.c
@@ -9,7 +9,6 @@
#include "xdiff-interface.h"
#include "diff.h"
#include "diffcore.h"
-#include "commit.h"
#include "quote.h"
#include "help.h"
@@ -622,7 +621,7 @@ static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
*list = p->next;
x = compile_pattern_or(list);
if (!*list || (*list)->token != GREP_CLOSE_PAREN)
- die("unmatched parenthesis");
+ die("unmatched ( for expression group");
*list = (*list)->next;
return x;
default:
@@ -793,7 +792,7 @@ void compile_grep_patterns(struct grep_opt *opt)
if (p)
opt->pattern_expression = compile_pattern_expr(&p);
if (p)
- die("incomplete pattern expression: %s", p->pattern);
+ die("incomplete pattern expression group: %s", p->pattern);
if (opt->no_body_match && opt->pattern_expression)
opt->pattern_expression = grep_not_expr(opt->pattern_expression);