summaryrefslogtreecommitdiff
path: root/git-resolve-script
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 /git-resolve-script
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 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions