git-cvsimport-script: leave working directory alone.

[git.git] / epoch.c

diff --git a/epoch.c b/epoch.c
index 35756a3..cbbc418 100644 (file)
--- a/epoch.c
+++ b/epoch.c
@@ -424,19 +424,10 @@ static void mark_ancestors_uninteresting(struct commit *commit)
 static void sort_first_epoch(struct commit *head, struct commit_list **stack)
 {
        struct commit_list *parents;
-       struct commit_list *reversed_parents = NULL;
 
        head->object.flags |= VISITED;
 
        /*
-        * parse_commit() builds the parent list in reverse order with respect
-        * to the order of the git-commit-tree arguments. So we need to reverse
-        * this list to output the oldest (or most "local") commits last.
-        */
-       for (parents = head->parents; parents; parents = parents->next)
-               commit_list_insert(parents->item, &reversed_parents);
-
-       /*
         * TODO: By sorting the parents in a different order, we can alter the
         * merge order to show contemporaneous changes in parallel branches
         * occurring after "local" changes. This is useful for a developer
@@ -445,8 +436,8 @@ static void sort_first_epoch(struct commit *head, struct commit_list **stack)
         * changes.
         */
 
-       while (reversed_parents) {
-               struct commit *parent = pop_commit(&reversed_parents);
+       for (parents = head->parents; parents; parents = parents->next) {
+               struct commit *parent = parents->item;
 
                if (head->object.flags & UNINTERESTING) {
                        /*
@@ -470,7 +461,7 @@ static void sort_first_epoch(struct commit *head, struct commit_list **stack)
 
                        } else {
                                sort_first_epoch(parent, stack);
-                               if (reversed_parents) {
+                               if (parents) {
                                        /*
                                         * This indicates a possible
                                         * discontinuity it may not be be
@@ -497,7 +488,7 @@ static void sort_first_epoch(struct commit *head, struct commit_list **stack)
  *
  * Sets the return value to STOP if no further output should be generated.
  */
-static int emit_stack(struct commit_list **stack, emitter_func emitter)
+static int emit_stack(struct commit_list **stack, emitter_func emitter, int include_last)
 {
        unsigned int seen = 0;
        int action = CONTINUE;
@@ -505,8 +496,11 @@ static int emit_stack(struct commit_list **stack, emitter_func emitter)
        while (*stack && (action != STOP)) {
                struct commit *next = pop_commit(stack);
                seen |= next->object.flags;
-               if (*stack)
+               if (*stack || include_last) {
+                       if (!*stack) 
+                               next->object.flags |= BOUNDARY;
                        action = (*emitter) (next);
+               }
        }
 
        if (*stack) {
@@ -562,7 +556,7 @@ static int sort_in_merge_order(struct commit *head_of_epoch, emitter_func emitte
                } else {
                        struct commit_list *stack = NULL;
                        sort_first_epoch(next, &stack);
-                       action = emit_stack(&stack, emitter);
+                       action = emit_stack(&stack, emitter, (base == NULL));
                        next = base;
                }
        }
@@ -645,7 +639,7 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
                        }
                }
 
-               action = emit_stack(&stack, emitter);
+               action = emit_stack(&stack, emitter, (base==NULL));
        }
 
        if (base && (action != STOP)) {