X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-list.c;h=22141e2b045bb4e54709ec16c83942fcfdd44ed2;hb=5941a9e9d882b12dcc2a80e55acb25c180475529;hp=812d237f472d943767764def599b70e4039d7d8a;hpb=41ce93bea4a90becb0e4a84c58dc2f78e7a6d19b;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 812d237f..22141e2b 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -4,12 +4,12 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
-#include "diff.h"
+#include "tree-walk.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"
@@ -39,15 +39,21 @@ struct rev_info revs;
 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_parents) {
+	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 (revs.parents) {
 		struct commit_list *parents = commit->parents;
 		while (parents) {
 			struct object *o = &(parents->item->object);
@@ -331,8 +337,8 @@ int main(int argc, const char **argv)
 				commit_prefix = "commit ";
 			continue;
 		}
-		if (!strcmp(arg, "--parents")) {
-			show_parents = 1;
+		if (!strcmp(arg, "--timestamp")) {
+			show_timestamp = 1;
 			continue;
 		}
 		if (!strcmp(arg, "--bisect")) {
@@ -349,6 +355,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 +365,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;