SCM-Manager

mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00

Files

René Pfeuffer a9300df7f4 Fix incoming diff with merges from target branch.

Taking the git history example below, the previous version only computed
commits 'b3' upward for log of 'b' with ancestor 'master' and missed
commits 'b1', 'b2' and the first merge.

* 86e9ca0 (HEAD -> b) b5
*   d69edb3 Merge branch 'master' into b
|\
| * 946a8db (master) f
| * b19b9cc e
* | 3d6109c b4
* | 6330653 b3
* |   a49a28e Merge branch 'master' into b
|\ \
| |/
| * 0235584 d
| * 20251c5 c
* | 5023b85 b2
* | 201ecc1 b1
|/
* 36b19e4 b
* c2190a9 a

2018-12-19 13:33:57 +01:00