Merge branch 'master' into lt/logopt

* master:
  pager: do not fork a pager if PAGER is set to empty.
  diff-options: add --patch-with-stat
  diff-files --stat: do not dump core with unmerged index.
  Support "git cmd --help" syntax
  diff --stat: do not do its own three-dashes.
  diff-tree: typefix.
  GIT v1.3.0-rc4
  xdiff: post-process hunks to make them consistent.

diff --combined git.c
index 9e29ade,140ed18..a6cfd1d
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -278,33 -278,91 +278,33 @@@ static int cmd_help(int argc, const cha
  
  #define LOGSIZE (65536)
  
 -static int cmd_log(int argc, const char **argv, char **envp)
 +static int cmd_log_wc(int argc, const char **argv, char **envp,
 +                    struct rev_info *rev)
  {
 -      struct rev_info rev;
        struct commit *commit;
        char *buf = xmalloc(LOGSIZE);
 -      static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
 -      int abbrev = DEFAULT_ABBREV;
 -      int abbrev_commit = 0;
        const char *commit_prefix = "commit ";
 -      struct log_tree_opt opt;
        int shown = 0;
 -      int do_diff = 0;
 -      int full_diff = 0;
  
 -      init_log_tree_opt(&opt);
 -      argc = setup_revisions(argc, argv, &rev, "HEAD");
 -      while (1 < argc) {
 -              const char *arg = argv[1];
 -              if (!strncmp(arg, "--pretty", 8)) {
 -                      commit_format = get_commit_format(arg + 8);
 -                      if (commit_format == CMIT_FMT_ONELINE)
 -                              commit_prefix = "";
 -              }
 -              else if (!strcmp(arg, "--no-abbrev")) {
 -                      abbrev = 0;
 -              }
 -              else if (!strcmp(arg, "--abbrev")) {
 -                      abbrev = DEFAULT_ABBREV;
 -              }
 -              else if (!strcmp(arg, "--abbrev-commit")) {
 -                      abbrev_commit = 1;
 -              }
 -              else if (!strncmp(arg, "--abbrev=", 9)) {
 -                      abbrev = strtoul(arg + 9, NULL, 10);
 -                      if (abbrev && abbrev < MINIMUM_ABBREV)
 -                              abbrev = MINIMUM_ABBREV;
 -                      else if (40 < abbrev)
 -                              abbrev = 40;
 -              }
 -              else if (!strcmp(arg, "--full-diff")) {
 -                      do_diff = 1;
 -                      full_diff = 1;
 -              }
 -              else {
 -                      int cnt = log_tree_opt_parse(&opt, argv+1, argc-1);
 -                      if (0 < cnt) {
 -                              do_diff = 1;
 -                              argv += cnt;
 -                              argc -= cnt;
 -                              continue;
 -                      }
 -                      die("unrecognized argument: %s", arg);
 -              }
 -
 -              argc--; argv++;
 -      }
 +      if (argc > 1)
 +              die("unrecognized argument: %s", argv[1]);
 +      if (rev->commit_format == CMIT_FMT_ONELINE)
 +              commit_prefix = "";
  
 -      if (do_diff) {
 -              opt.diffopt.abbrev = abbrev;
 -              opt.verbose_header = 0;
 -              opt.always_show_header = 0;
 -              opt.no_commit_id = 1;
 -              if (opt.combine_merges)
 -                      opt.ignore_merges = 0;
 -              if (opt.dense_combined_merges)
 -                      opt.diffopt.output_format = DIFF_FORMAT_PATCH;
 -              if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
 -                      opt.diffopt.recursive = 1;
 -              if (!full_diff && rev.prune_data)
 -                      diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
 -              diff_setup_done(&opt.diffopt);
 -      }
 -
 -      prepare_revision_walk(&rev);
 +      prepare_revision_walk(rev);
        setup_pager();
 -      while ((commit = get_revision(&rev)) != NULL) {
 -              if (shown && do_diff && commit_format != CMIT_FMT_ONELINE)
 +      while ((commit = get_revision(rev)) != NULL) {
 +              if (shown && rev->diff &&
 +                  rev->commit_format != CMIT_FMT_ONELINE)
                        putchar('\n');
                fputs(commit_prefix, stdout);
 -              if (abbrev_commit && abbrev)
 -                      fputs(find_unique_abbrev(commit->object.sha1, abbrev),
 +              if (rev->abbrev_commit && rev->abbrev)
 +                      fputs(find_unique_abbrev(commit->object.sha1,
 +                                               rev->abbrev),
                              stdout);
                else
                        fputs(sha1_to_hex(commit->object.sha1), stdout);
 -              if (rev.parents) {
 +              if (rev->parents) {
                        struct commit_list *parents = commit->parents;
                        while (parents) {
                                struct object *o = &(parents->item->object);
@@@ -323,15 -381,17 +323,17 @@@
                             parents = parents->next)
                                parents->item->object.flags &= ~TMP_MARK;
                }
 -              if (commit_format == CMIT_FMT_ONELINE)
 +              if (rev->commit_format == CMIT_FMT_ONELINE)
                        putchar(' ');
                else
                        putchar('\n');
 -              pretty_print_commit(commit_format, commit, ~0, buf,
 -                                  LOGSIZE, abbrev);
 +              pretty_print_commit(rev->commit_format, commit, ~0, buf,
 +                                  LOGSIZE, rev->abbrev);
                printf("%s\n", buf);
-               if (rev->diff)
 -              if (do_diff) {
++              if (rev->diff) {
+                       printf("---\n");
 -                      log_tree_commit(&opt, commit);
 +                      log_tree_commit(rev, commit);
+               }
                shown = 1;
                free(commit->buffer);
                commit->buffer = NULL;
@@@ -340,49 -400,6 +342,49 @@@
        return 0;
  }
  
 +static int cmd_wc(int argc, const char **argv, char **envp)
 +{
 +      struct rev_info rev;
 +
 +      init_revisions(&rev);
 +      rev.abbrev = DEFAULT_ABBREV;
 +      rev.no_commit_id = 1;
 +      rev.commit_format = CMIT_FMT_DEFAULT;
 +      rev.diff = 1;
 +      rev.diffopt.recursive = 1;
 +      argc = setup_revisions(argc, argv, &rev, "HEAD");
 +      return cmd_log_wc(argc, argv, envp, &rev);
 +}
 +
 +static int cmd_show(int argc, const char **argv, char **envp)
 +{
 +      struct rev_info rev;
 +
 +      init_revisions(&rev);
 +      rev.diff = 1;
 +      rev.ignore_merges = 0;
 +      rev.combine_merges = 1;
 +      rev.dense_combined_merges = 1;
 +      rev.abbrev = DEFAULT_ABBREV;
 +      rev.commit_format = CMIT_FMT_DEFAULT;
 +      rev.diffopt.recursive = 1;
 +      rev.no_walk = 1;
 +      argc = setup_revisions(argc, argv, &rev, "HEAD");
 +      return cmd_log_wc(argc, argv, envp, &rev);
 +}
 +
 +static int cmd_log(int argc, const char **argv, char **envp)
 +{
 +      struct rev_info rev;
 +
 +      init_revisions(&rev);
 +      rev.abbrev = DEFAULT_ABBREV;
 +      rev.no_commit_id = 1;
 +      rev.commit_format = CMIT_FMT_DEFAULT;
 +      argc = setup_revisions(argc, argv, &rev, "HEAD");
 +      return cmd_log_wc(argc, argv, envp, &rev);
 +}
 +
  static void handle_internal_command(int argc, const char **argv, char **envp)
  {
        const char *cmd = argv[0];
@@@ -393,11 -410,15 +395,17 @@@
                { "version", cmd_version },
                { "help", cmd_help },
                { "log", cmd_log },
 +              { "whatchanged", cmd_wc },
 +              { "show", cmd_show },
        };
        int i;
  
+       /* Turn "git cmd --help" into "git help cmd" */
+       if (argc > 1 && !strcmp(argv[1], "--help")) {
+               argv[1] = argv[0];
+               argv[0] = cmd = "help";
+       }
+ 
        for (i = 0; i < ARRAY_SIZE(commands); i++) {
                struct cmd_struct *p = commands+i;
                if (strcmp(p->cmd, cmd))