Fix pack-index issue on 64-bit platforms a bit more portably.

[git.git] / git.c

diff --git a/git.c b/git.c
index fa58232..5209b04 100644 (file)
--- a/git.c
+++ b/git.c
@@ -15,7 +15,9 @@
 
 #include "cache.h"
 #include "commit.h"
+#include "diff.h"
 #include "revision.h"
+#include "log-tree.h"
 
 #ifndef PATH_MAX
 # define PATH_MAX 4096
@@ -285,7 +287,12 @@ static int cmd_log(int argc, const char **argv, char **envp)
        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];
@@ -310,14 +317,43 @@ static int cmd_log(int argc, const char **argv, char **envp)
                        else if (40 < abbrev)
                                abbrev = 40;
                }
-               else
+               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 (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 (!full_diff && rev.prune_data)
+                       diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
+               diff_setup_done(&opt.diffopt);
+       }
+
        prepare_revision_walk(&rev);
        setup_pager();
        while ((commit = get_revision(&rev)) != NULL) {
+               if (shown && do_diff && commit_format != CMIT_FMT_ONELINE)
+                       putchar('\n');
                fputs(commit_prefix, stdout);
                if (abbrev_commit && abbrev)
                        fputs(find_unique_abbrev(commit->object.sha1, abbrev),
@@ -350,6 +386,13 @@ static int cmd_log(int argc, const char **argv, char **envp)
                pretty_print_commit(commit_format, commit, ~0, buf,
                                    LOGSIZE, abbrev);
                printf("%s\n", buf);
+               if (do_diff) {
+                       printf("---\n");
+                       log_tree_commit(&opt, commit);
+               }
+               shown = 1;
+               free(commit->buffer);
+               commit->buffer = NULL;
        }
        free(buf);
        return 0;
@@ -368,6 +411,12 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
        };
        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))