aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 11:16:09 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-11 11:16:09 -0700
commitf5f37461a9d261938ca2bdd9cfcc0da1268f45af (patch)
tree6c94a84b61d877c04a708e060f5acc69009b09f5
parent51eb3175efc4733ce20a733b7f542b7551a7a961 (diff)
parent2385f24625cda7cc050996d9966e57be2d4d11a3 (diff)
downloadgit-f5f37461a9d261938ca2bdd9cfcc0da1268f45af.tar.gz
git-f5f37461a9d261938ca2bdd9cfcc0da1268f45af.tar.xz
Merge branch 'ah/maint-grep-double-init' into maint
By Angus Hammond * ah/maint-grep-double-init: grep.c: remove redundant line of code
-rw-r--r--grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/grep.c b/grep.c
index 190139cfc..f8ffa4620 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.");