diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2005-06-22 01:58:46 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 17:54:44 -0700 |
| commit | 60646e9a7170750093599fc52ad56453fc516185 (patch) | |
| tree | 72330cc49cb47982e6339822ac24823bacc2f049 | |
| parent | bac15c454ecc8ee0824451ffdd5406150714c432 (diff) | |
| download | git-60646e9a7170750093599fc52ad56453fc516185.tar.gz git-60646e9a7170750093599fc52ad56453fc516185.tar.xz | |
[PATCH] Fix --merge-order unit test breaks introduced by 6c88be169881c9223532796bd225e79afaa115e1
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | epoch.c | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -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 |