[Development] gerrit : using branches (was: pointers to use it cleverly/efficiently?)

[René J.V. Bertin]

On Monday April 04 2016 11:56:23 Welbourne Edward wrote:

>You can even use: git log --graph
>if you can cope with ASCII art ;-)

As long as it doesn't include cows ;)

>merge-base - if you have a strict tree, this isn't a merge, so it's
>where one was branched off the other, but nothing about the merge-base
>or any of its ancestors contains any hint as to which branch it was on
>when it was committed.

In short, there's something like a table for each branch that tells what commits "belong" to that branch, but there's no way to obtain the branch from a given commit?


>suspects (5.5, 5.6, 5.7, dev) and see which one has the closest ancestor
>as git merge-base; or I pipe git shortlog 5.6...$branch | wc -l and

That looks like something not really trivial to capture in a script; you'd need to do `git merge-base $topic $branch` for all (remote) branches, and then check the returned commits against `git rev-list $topic` to see which comes first ... which might not even be correct under certain border cases.

Playing with it I get the impression that KDevelop does have a function to figure out parenthood; at least I now understand why it shows one of my 2 topic branches as a child of the other (both were created off the same commit).

R