X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=epoch.c;h=6dbcfb34a5a8762608e99fe79f1a4f17475d6f8a;hb=723c31fea2f1c4994de837bda9022ffa8b6de1bb;hp=35756a37ee13a752f73568c4570250aa28bf8afa;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git

diff --git a/epoch.c b/epoch.c
index 35756a37..6dbcfb34 100644
--- a/epoch.c
+++ b/epoch.c
@@ -28,7 +28,7 @@ static BN_CTX *context = NULL;
 static struct fraction *one = NULL;
 static struct fraction *zero = NULL;
 
-static BN_CTX *get_BN_CTX()
+static BN_CTX *get_BN_CTX(void)
 {
 	if (!context) {
 		context = BN_CTX_new();
@@ -36,7 +36,7 @@ static BN_CTX *get_BN_CTX()
 	return context;
 }
 
-static struct fraction *new_zero()
+static struct fraction *new_zero(void)
 {
 	struct fraction *result = xmalloc(sizeof(*result));
 	BN_init(&result->numerator);
@@ -75,7 +75,7 @@ static struct fraction *init_fraction(struct fraction *fraction)
 	return fraction;
 }
 
-static struct fraction *get_one()
+static struct fraction *get_one(void)
 {
 	if (!one) {
 		one = new_zero();
@@ -84,7 +84,7 @@ static struct fraction *get_one()
 	return one;
 }
 
-static struct fraction *get_zero()
+static struct fraction *get_zero(void)
 {
 	if (!zero) {
 		zero = new_zero();
@@ -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;
 		}
 	}
@@ -591,14 +585,9 @@ int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter)
 	for (; list; list = list->next) {
 		struct commit *next = list->item;
 
-		if (!(next->object.flags & UNINTERESTING)) {
-			if (next->object.flags & DUPCHECK) {
-				fprintf(stderr, "%s: duplicate commit %s ignored\n",
-					__FUNCTION__, sha1_to_hex(next->object.sha1));
-			} else {
-				next->object.flags |= DUPCHECK;
-				commit_list_insert(list->item, &reversed);
-			}
+		if (!(next->object.flags & DUPCHECK)) {
+			next->object.flags |= DUPCHECK;
+			commit_list_insert(list->item, &reversed);
 		}
 	}
 
@@ -645,7 +634,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)) {