diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-20 18:59:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-20 18:59:09 -0700 |
| commit | 065b0702f748b50e69d67609ace2632ce04b79a1 (patch) | |
| tree | 6a78474d618eb083713429dc064c1c8e07e6382c /grep.c | |
| parent | Extend sample pre-commit hook to check for non ascii filenames (diff) | |
| parent | grep: fix word-regexp colouring (diff) | |
| download | git-065b0702f748b50e69d67609ace2632ce04b79a1.tar.gz git-065b0702f748b50e69d67609ace2632ce04b79a1.zip | |
Merge branch 'maint'
* maint:
grep: fix word-regexp colouring
completion: use git rev-parse to detect bare repos
Cope better with a _lot_ of packs
for-each-ref: fix segfault in copy_email
Diffstat (limited to 'grep.c')
| -rw-r--r-- | grep.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -305,6 +305,7 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol, { int hit = 0; int saved_ch = 0; + const char *start = bol; if ((p->token != GREP_PATTERN) && ((p->token == GREP_PATTERN_HEAD) != (ctx == GREP_CONTEXT_HEAD))) @@ -365,6 +366,10 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol, } if (p->token == GREP_PATTERN_HEAD && saved_ch) *eol = saved_ch; + if (hit) { + pmatch[0].rm_so += bol - start; + pmatch[0].rm_eo += bol - start; + } return hit; } |