assume unchanged git: diff-index fix.

[git.git] / rev-list.c

diff --git a/rev-list.c b/rev-list.c
index 812d237..f3a989c 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -7,9 +7,9 @@
 #include "diff.h"
 #include "revision.h"
 
-/* bits #0-4 in revision.h */
+/* bits #0-5 in revision.h */
 
-#define COUNTED                (1u<<5)
+#define COUNTED                (1u<<6)
 
 static const char rev_list_usage[] =
 "git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -40,13 +40,20 @@ static int bisect_list = 0;
 static int verbose_header = 0;
 static int abbrev = DEFAULT_ABBREV;
 static int show_parents = 0;
+static int show_timestamp = 0;
 static int hdr_termination = 0;
 static const char *commit_prefix = "";
 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 
 static void show_commit(struct commit *commit)
 {
-       printf("%s%s", commit_prefix, sha1_to_hex(commit->object.sha1));
+       if (show_timestamp)
+               printf("%lu ", commit->date);
+       if (commit_prefix[0])
+               fputs(commit_prefix, stdout);
+       if (commit->object.flags & BOUNDARY)
+               putchar('-');
+       fputs(sha1_to_hex(commit->object.sha1), stdout);
        if (show_parents) {
                struct commit_list *parents = commit->parents;
                while (parents) {
@@ -335,6 +342,10 @@ int main(int argc, const char **argv)
                        show_parents = 1;
                        continue;
                }
+               if (!strcmp(arg, "--timestamp")) {
+                       show_timestamp = 1;
+                       continue;
+               }
                if (!strcmp(arg, "--bisect")) {
                        bisect_list = 1;
                        continue;
@@ -349,6 +360,9 @@ int main(int argc, const char **argv)
            (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
                usage(rev_list_usage);
 
+       save_commit_buffer = verbose_header;
+       track_object_refs = 0;
+
        prepare_revision_walk(&revs);
        if (revs.tree_objects)
                mark_edges_uninteresting(revs.commits);
@@ -356,9 +370,6 @@ int main(int argc, const char **argv)
        if (bisect_list)
                revs.commits = find_bisection(revs.commits);
 
-       save_commit_buffer = verbose_header;
-       track_object_refs = 0;
-
        show_commit_list(&revs);
 
        return 0;