Hello!
Imagine following tree:
A--B--C
\ /
D--E
B is parent #1 of C.
git rev-list --first-parent --ancestry-path D..C returns zero commits.
This is correct, since one cannot find any commits between D and C
traversing tree by first parent.
git rev-list --first-parent --ancestry-path E..C
help
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
> get_octopus_merge_bases()
>
> Scripts that use "merge-base --octopus" could do the reducing
> themselves, but most of them are expected to want to get the reduced
> results without having to do any work themselves.
>
> Tests are taken from a message by Василий Макар
And here is the test:
with git 1.8.5.2 this test don't pass because of git merge-base may
return duplicates and incorrect set of bases (not best common
ancestors)
---
t/t6010-merge-base.sh | 39 +++
1 file changed, 39 insertions(+)
diff --git a/t/t6010-merge-b
Hi there!
First of all: I'm new to mailing-lists, sorry if I'm doing it wrong.
I've found a bug in git merge-base, causing it to show not best common
ancestors and duplicates under some circumstances (example is given in
attached test case).
Problem cause is algorithm used in get_octopus_merge_bas
5 matches
Mail list logo