From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 19:09:18 +0000 (-0700)
Subject: Merge branch 'jc/log-quiet-fix'
X-Git-Tag: v1.7.6-rc0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b9575e78e504d0fed4747bb2325aa09e2626b6e9;p=git.git

Merge branch 'jc/log-quiet-fix'

* jc/log-quiet-fix:
  log: --quiet should serve as synonym to -s
---

b9575e78e504d0fed4747bb2325aa09e2626b6e9
diff --cc builtin/log.c
index 27849dc91,4b7f8f47f..224b16792
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -106,7 -88,22 +106,9 @@@ static void cmd_log_init_finish(int arg
  			     PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
  			     PARSE_OPT_KEEP_DASHDASH);
  
 -	rev->abbrev = DEFAULT_ABBREV;
 -	rev->commit_format = CMIT_FMT_DEFAULT;
 -	if (fmt_pretty)
 -		get_commit_format(fmt_pretty, rev);
 -	rev->verbose_header = 1;
 -	DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
 -	rev->show_root_diff = default_show_root;
 -	rev->subject_prefix = fmt_patch_subject_prefix;
 -	DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
 -
 -	if (default_date_mode)
 -		rev->date_mode = parse_date_format(default_date_mode);
 -
  	argc = setup_revisions(argc, argv, rev, opt);
+ 	if (quiet)
+ 		rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
  
  	/* Any arguments at this point are not recognized */
  	if (argc > 1)