summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-09-13 01:24:20 -0700
committerJunio C Hamano <gitster@pobox.com>2009-09-13 01:24:20 -0700
commit45c58ba00a9c4e31e94997b59fd8112f962fa222 (patch)
tree74f2d92d9560adb88aa065c1003522e4a39388bb /grep.h
parent59b8d38f6e4f19b93c5dc4493ab11706acd101b5 (diff)
parent493b7a08d80535def6756b281873e4e0937ba6c2 (diff)
downloadgit-45c58ba00a9c4e31e94997b59fd8112f962fa222.tar.gz
Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint
* cb/maint-1.6.3-grep-relative-up: grep: accept relative paths outside current working directory grep: fix exit status if external_grep() punts Conflicts: t/t7002-grep.sh
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index f00db0e402..5581363c4d 100644
--- a/grep.h
+++ b/grep.h
@@ -59,6 +59,7 @@ struct grep_opt {
struct grep_pat *pattern_list;
struct grep_pat **pattern_tail;
struct grep_expr *pattern_expression;
+ const char *prefix;
int prefix_length;
regex_t regexp;
int linenum;