sha1_file: rename LOOKUP_UNKNOWN_OBJECT

diff --git a/grep.h b/grep.h
index 073b0e4c92964a49b0eeba4b3059d633836f7880..38ac82b6384f8c6a505a8ed764610aa8404f8597 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -46,9 +46,9 @@ struct grep_pat {
        size_t patternlen;
        enum grep_header_field field;
        regex_t regexp;
-       pcre *pcre_regexp;
-       pcre_extra *pcre_extra_info;
-       const unsigned char *pcre_tables;
+       pcre *pcre1_regexp;
+       pcre_extra *pcre1_extra_info;
+       const unsigned char *pcre1_tables;
        kwset_t kws;
        unsigned fixed:1;
        unsigned ignore_case:1;
@@ -111,7 +111,7 @@ struct grep_opt {
        int allow_textconv;
        int extended;
        int use_reflog_filter;
-       int pcre;
+       int pcre1;
        int relative;
        int pathname;
        int null_following_name;