From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2012 21:37:53 +0000 (-0700)
Subject: Merge branch 'jc/maint-log-grep-all-match'
X-Git-Tag: v1.8.0-rc0~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d7535e42496a5b24d8cb17da1a332759928bd35;p=git

Merge branch 'jc/maint-log-grep-all-match'

Fix a long-standing bug in "git log --grep" when multiple "--grep"
are used together with "--all-match" and "--author" or "--committer".

* jc/maint-log-grep-all-match:
  t7810-grep: test --all-match with multiple --grep and --author options
  t7810-grep: test interaction of multiple --grep and --author options
  t7810-grep: test multiple --author with --all-match
  t7810-grep: test multiple --grep with and without --all-match
  t7810-grep: bring log --grep tests in common form
  grep.c: mark private file-scope symbols as static
  log: document use of multiple commit limiting options
  log --grep/--author: honor --all-match honored for multiple --grep patterns
  grep: show --debug output only once
  grep: teach --debug option to dump the parse tree
---

3d7535e42496a5b24d8cb17da1a332759928bd35
diff --cc builtin/grep.c
index 09ca4c980e,a7e8df0d40..82530a61b4
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@@ -814,16 -770,19 +815,19 @@@ int cmd_grep(int argc, const char **arg
  		  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
  		  close_callback },
  		OPT__QUIET(&opt.status_only,
 -			   "indicate hit with exit status without output"),
 +			   N_("indicate hit with exit status without output")),
  		OPT_BOOLEAN(0, "all-match", &opt.all_match,
 -			"show only matches from files that match all patterns"),
 +			N_("show only matches from files that match all patterns")),
+ 		{ OPTION_SET_INT, 0, "debug", &opt.debug, NULL,
 -		  "show parse tree for grep expression",
++		  N_("show parse tree for grep expression"),
+ 		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1 },
  		OPT_GROUP(""),
  		{ OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager,
 -			"pager", "show matching files in the pager",
 +			N_("pager"), N_("show matching files in the pager"),
  			PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
  		OPT_BOOLEAN(0, "ext-grep", &external_grep_allowed__ignored,
 -			    "allow calling of grep(1) (ignored by this build)"),
 -		{ OPTION_CALLBACK, 0, "help-all", &options, NULL, "show usage",
 +			    N_("allow calling of grep(1) (ignored by this build)")),
 +		{ OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"),
  		  PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
  		OPT_END()
  	};