From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Dec 2010 05:49:52 +0000 (-0800)
Subject: Merge branch 'tc/format-patch-p'
X-Git-Tag: v1.7.4-rc0~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/33935dca6db41f3d84f28abb66f94c1f2cc1974b?ds=inline;hp=-c

Merge branch 'tc/format-patch-p'

* tc/format-patch-p:
format-patch: page output with --stdout
---

33935dca6db41f3d84f28abb66f94c1f2cc1974b
diff --combined builtin/log.c
index 4191d9c4e5,f039fe1fd1..d8c6c28d2f
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -329,7 -329,8 +329,7 @@@ static void show_tagger(char *buf, int 
  	struct strbuf out = STRBUF_INIT;
  
  	pp_user_info("Tagger", rev->commit_format, &out, buf, rev->date_mode,
 -		git_log_output_encoding ?
 -		git_log_output_encoding: git_commit_encoding);
 +		get_log_output_encoding());
  	printf("%s", out.buf);
  	strbuf_release(&out);
  }
@@@ -1158,6 -1159,8 +1158,8 @@@ int cmd_format_patch(int argc, const ch
  
  	if (!use_stdout)
  		output_directory = set_outdir(prefix, output_directory);
+ 	else
+ 		setup_pager();
  
  	if (output_directory) {
  		if (use_stdout)
@@@ -1364,7 -1367,7 +1366,7 @@@ int cmd_cherry(int argc, const char **a
  
  	struct option options[] = {
  		OPT__ABBREV(&abbrev),
 -		OPT__VERBOSE(&verbose),
 +		OPT__VERBOSE(&verbose, "be verbose"),
  		OPT_END()
  	};