Merge branch 'master' into lt/logopt

[git.git] / git.c

diff --git a/git.c b/git.c
index 9a89b0a..a6cfd1d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -330,8 +330,10 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
                pretty_print_commit(rev->commit_format, commit, ~0, buf,
                                    LOGSIZE, rev->abbrev);
                printf("%s\n", buf);
-               if (rev->diff)
+               if (rev->diff) {
+                       printf("---\n");
                        log_tree_commit(rev, commit);
+               }
                shown = 1;
                free(commit->buffer);
                commit->buffer = NULL;
@@ -354,6 +356,23 @@ static int cmd_wc(int argc, const char **argv, char **envp)
        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;
@@ -377,9 +396,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))