summaryrefslogtreecommitdiff
path: root/epoch.c
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-08 14:37:41 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:37:10 (GMT)
commit4e7346735aaf0e0d15f0b18023ac21d983b9fd83 (patch)
tree4a9417a017d28d2aa6e29f31d9fdcae60a08f031 /epoch.c
parent32798c707e701a7b0b7c19b469a1fcb57bda1f66 (diff)
downloadgit-4e7346735aaf0e0d15f0b18023ac21d983b9fd83.zip
git-4e7346735aaf0e0d15f0b18023ac21d983b9fd83.tar.gz
git-4e7346735aaf0e0d15f0b18023ac21d983b9fd83.tar.bz2
[PATCH] three --merge-order bug fixes
This patch fixes three bugs in --merge-order support * mark_ancestors_uninteresting was unnecessarily exponential which caused a problem when a commit with no parents was merged near the head of something like the linux kernel * removed a spurious statement from find_base which wasn't apparently causing problems now, but wasn't correct either. * removed an unnecessarily strict check from find_base_for_list that causes a problem if git-rev-list commit ^parent-of-commit is specified. * added some unit tests which were accidentally omitted from original merge-order patch The fix to mark_ancestors_uninteresting isn't an optimal fix - a full graph scan will still be performed in this case even though it is not strictly required. However, a full graph scan is linear and still no worse than git-rev-list HEAD which runs in less than 2 seconds on a warm cache. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'epoch.c')
-rw-r--r--epoch.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/epoch.c b/epoch.c
index ba63eac..3a484b0 100644
--- a/epoch.c
+++ b/epoch.c
@@ -229,7 +229,7 @@ static int find_base_for_list(struct commit_list *list, struct commit **boundary
struct commit *item = list->item;
- if (item->object.util || (item->object.flags & UNINTERESTING)) {
+ if (item->object.util) {
die("%s:%d:%s: logic error: this should not have happened - commit %s\n",
__FILE__, __LINE__, __FUNCTION__, sha1_to_hex(item->object.sha1));
}
@@ -323,7 +323,6 @@ static int find_base(struct commit *head, struct commit **boundary)
struct commit_list *pending = NULL;
struct commit_list *next;
- commit_list_insert(head, &pending);
for (next = head->parents; next; next = next->next) {
commit_list_insert(next->item, &pending);
}
@@ -418,8 +417,8 @@ static void mark_ancestors_uninteresting(struct commit *commit)
int boundary = flags & BOUNDARY;
int uninteresting = flags & UNINTERESTING;
+ commit->object.flags |= UNINTERESTING;
if (uninteresting || boundary || !visited) {
- commit->object.flags |= UNINTERESTING;
return;
// we only need to recurse if