Merge branch 'fix'

diff --git a/git.c b/git.c
index 9a89b0afbdb16f0c044741e2772066e73186c5c3..40b7e42ae9f87b5cdc7e2f968bbb12caa8f2d01c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -276,67 +276,26 @@ static int cmd_help(int argc, const char **argv, char **envp)
        return 0;
 }
 
-#define LOGSIZE (65536)
-
 static int cmd_log_wc(int argc, const char **argv, char **envp,
                      struct rev_info *rev)
 {
        struct commit *commit;
-       char *buf = xmalloc(LOGSIZE);
-       const char *commit_prefix = "commit ";
-       int shown = 0;
+
+       rev->abbrev = DEFAULT_ABBREV;
+       rev->commit_format = CMIT_FMT_DEFAULT;
+       rev->verbose_header = 1;
+       argc = setup_revisions(argc, argv, rev, "HEAD");
 
        if (argc > 1)
                die("unrecognized argument: %s", argv[1]);
-       if (rev->commit_format == CMIT_FMT_ONELINE)
-               commit_prefix = "";
 
        prepare_revision_walk(rev);
        setup_pager();
        while ((commit = get_revision(rev)) != NULL) {
-               if (shown && rev->diff &&
-                   rev->commit_format != CMIT_FMT_ONELINE)
-                       putchar('\n');
-               fputs(commit_prefix, stdout);
-               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) {
-                       struct commit_list *parents = commit->parents;
-                       while (parents) {
-                               struct object *o = &(parents->item->object);
-                               parents = parents->next;
-                               if (o->flags & TMP_MARK)
-                                       continue;
-                               printf(" %s", sha1_to_hex(o->sha1));
-                               o->flags |= TMP_MARK;
-                       }
-                       /* TMP_MARK is a general purpose flag that can
-                        * be used locally, but the user should clean
-                        * things up after it is done with them.
-                        */
-                       for (parents = commit->parents;
-                            parents;
-                            parents = parents->next)
-                               parents->item->object.flags &= ~TMP_MARK;
-               }
-               if (rev->commit_format == CMIT_FMT_ONELINE)
-                       putchar(' ');
-               else
-                       putchar('\n');
-               pretty_print_commit(rev->commit_format, commit, ~0, buf,
-                                   LOGSIZE, rev->abbrev);
-               printf("%s\n", buf);
-               if (rev->diff)
-                       log_tree_commit(rev, commit);
-               shown = 1;
+               log_tree_commit(rev, commit);
                free(commit->buffer);
                commit->buffer = NULL;
        }
-       free(buf);
        return 0;
 }
 
@@ -345,12 +304,23 @@ 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.diffopt.recursive = 1;
+       rev.combine_merges = 1;
+       rev.dense_combined_merges = 1;
+       rev.always_show_header = 1;
+       rev.ignore_merges = 0;
+       rev.no_walk = 1;
        return cmd_log_wc(argc, argv, envp, &rev);
 }
 
@@ -359,10 +329,8 @@ 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");
+       rev.always_show_header = 1;
+       rev.diffopt.recursive = 1;
        return cmd_log_wc(argc, argv, envp, &rev);
 }
 
@@ -377,9 +345,16 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "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))