X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=rev-list.c;h=ee88f567a7c9413376669c01050a210241701012;hb=ef5b4eabb6da7cead197e387589896345d3dfbc6;hp=441c43785540bfc4bdfc66c4e70e0a4168bb30ad;hpb=b9aa1f9e9d8f05f350c2e14d6389a5e8596033e9;p=git-core%2Fgit.git diff --git a/rev-list.c b/rev-list.c index 441c43785..ee88f567a 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] ... [ -- paths... ]\n" @@ -51,6 +51,8 @@ static void show_commit(struct commit *commit) 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; @@ -358,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); @@ -365,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;