Merge branch 'tc/format-patch-p'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:52 +0000 (21:49 -0800)
* tc/format-patch-p:
format-patch: page output with --stdout

1  2 
builtin/log.c
diff --combined builtin/log.c
index 4191d9c4e55c0745b96e8f93161ea10fb4ec7e0d,f039fe1fd14358f161729a1fb2e89d76359fd858..d8c6c28d2fcc3bd0744f071da536215141dc0d0b
@@@ -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()
        };