• Æ
    grep: remove redundant regflags assignments · e0b9f8ae
    Ævar Arnfjörð Bjarmason 提交于
    Remove redundant assignments to the "regflags" variable. This variable
    is only used set under GREP_PATTERN_TYPE_ERE, so there's no need to
    un-set it under GREP_PATTERN_TYPE_{FIXED,BRE,PCRE}.
    
    Back in 5010cb5f[1], we did do "opt.regflags &= ~REG_EXTENDED" upon
    seeing "-G" on the command line and flipped the bit on upon seeing
    "-E", but I think that was perfectly sensible and it would have been a
    bug if we didn't.  They were part of the command line parsing that
    could have seen "-E" on the command line earlier.
    
    When cca2c172 ("git-grep: do not die upon -F/-P when
    grep.extendedRegexp is set.", 2011-05-09) switched the command line
    parsing to "read into a 'tentatively this is what we saw the last'
    variable and then finally commit just once", we didn't touch
    opt.regflags for PCRE and FIXED, but we still had to flip regflags
    between BRE and ERE, because parsing of grep.extendedregexp
    configuration variable directly touched opt.regflags back then, which
    was done by b22520a3 ("grep: allow -E and -n to be turned on by
    default via configuration", 2011-03-30).
    
    When 84befcd0 ("grep: add a grep.patternType configuration setting",
    2012-08-03) introduced extended_regexp_option field, we stopped
    flipping regflags while reading the configuration, and that was when
    we should have noticed and stopped dropping REG_EXTENDED bit in the
    "now we can commit what type to use" helper function.
    
    There is no reason to do this anymore, so stop doing it, more to
    reduce "wait this is used under fixed/BRE/PCRE how?" confusion when
    reading the code, than to to save ourselves trivial CPU cycles by
    removing one assignment.
    
    1. "built-in "git grep"", 2006-04-30.
    Signed-off-by: NÆvar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    e0b9f8ae
grep.c 43.5 KB