kernel/git - git - PowerEL Git System

Tree: 89967023da

Author	SHA1	Message	Date
Daniel Barkalow	58e28af6a4	[PATCH] Allow multiple date-ordered lists Make pop_most_recent_commit() return the same objects multiple times, but only if called with different bits to mark. This is necessary to make merge-base work again. Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Daniel Barkalow	b6b15db3f4	[PATCH] Replace merge-base implementation The old implementation was a nice algorithm, but, unfortunately, it could be confused in some cases and would not necessarily do the obvious thing if one argument was decended from the other. This version fixes that by changing the criterion to the most recent common ancestor. Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Daniel Barkalow	b5039db6d2	[PATCH] Switch implementations of merge-base, port to parsing This switches to my implementation of merge-base, but with the new parsing library. Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	7d60ad7cc9	Make "parse_commit" return the "struct revision" for the commit. Also, make it a fatal error to pass in a non-commit object. The callers never checked, so better check here. This simplifies merge-base further. It's now so trivial that it's almost ridiculous.	20 years ago
Linus Torvalds	6683463ed6	Do a very simple "merge-base" that finds the most recent common parent of two commits. The question of "best" commit can probably be tweaked almost arbitrarily. In particular, trying to take things like how big the tree differences are into account migt be a good idea. This one is just very simple.	20 years ago