summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-09-13 01:30:53 -0700
committerJunio C Hamano <gitster@pobox.com>2009-09-13 01:30:53 -0700
commit5b590d783a461c63fa803d1c21b57bc79c0207f7 (patch)
tree3ad36990856314a6956226c0daf182f6df6762d5 /grep.h
parent0c3d3ac352427738e7c4393c0a959e0e698a0c7a (diff)
parent7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4 (diff)
downloadgit-5b590d783a461c63fa803d1c21b57bc79c0207f7.tar.gz
Merge branch 'maint'
* maint: GIT 1.6.4.3 svn: properly escape arguments for authors-prog http.c: remove verification of remote packs grep: accept relative paths outside current working directory grep: fix exit status if external_grep() punts Conflicts: GIT-VERSION-GEN RelNotes
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 28e6b2a8ec..f6eecc62c0 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;