From: Junio C Hamano Date: Fri, 11 May 2012 18:16:09 +0000 (-0700) Subject: Merge branch 'ah/maint-grep-double-init' into maint X-Git-Tag: v1.7.10.2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f5f37461a9d261938ca2bdd9cfcc0da1268f45af?hp=51eb3175efc4733ce20a733b7f542b7551a7a961 Merge branch 'ah/maint-grep-double-init' into maint By Angus Hammond * ah/maint-grep-double-init: grep.c: remove redundant line of code --- diff --git a/grep.c b/grep.c index 190139cfcd..f8ffa46209 100644 --- a/grep.c +++ b/grep.c @@ -318,7 +318,7 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt) if (!opt->header_list) return NULL; - p = opt->header_list; + for (p = opt->header_list; p; p = p->next) { if (p->token != GREP_PATTERN_HEAD) die("bug: a non-header pattern in grep header list.");