* [PATCH 1/1] Fix --merge-order unit test breaks introduced by 6c88be169881c9223532796bd225e79afaa115e1
@ 2005-06-21 15:58 Jon Seymour
0 siblings, 0 replies; only message in thread
From: Jon Seymour @ 2005-06-21 15:58 UTC (permalink / raw)
To: git; +Cc: torvalds, jon.seymour
The sensible cleanup of the in-memory storage order of commit parents broke the --merge-order
code which was dependent on the previous behaviour of parse_commit().
This patch restores the correctness --merge-order behaviour by taking account of the
new behaviour of parse_commit.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
Tested on Linus HEAD: 0795495388d703dc84110a9a7917dd6ec9516bb4.
---
epoch.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/epoch.c b/epoch.c
--- a/epoch.c
+++ b/epoch.c
@@ -424,19 +424,10 @@ static void mark_ancestors_uninteresting
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 comm
* 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 comm
} else {
sort_first_epoch(parent, stack);
- if (reversed_parents) {
+ if (parents) {
/*
* This indicates a possible
* discontinuity it may not be be
------------
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-06-21 15:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-06-21 15:58 [PATCH 1/1] Fix --merge-order unit test breaks introduced by 6c88be169881c9223532796bd225e79afaa115e1 Jon Seymour
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).