LogDlg: infinite line to parent when initial commit is branched
I noticed this issue in the log after combining two repositories. To combine the repositories I added repo B as a remote of repo A, then merged a branch of B with a branch of A. When checking the history after the merged I noticed a line running infinitely down past the initial commit for the branch of B (the red line in the following picture).
It seems when the log window draws the history for branching a commit, it assumes there is some other parent rather than that commit being the parent. In my scenario where two branches are merged that do not have a common history, this line searching for a parent continues the entire (unrelated) history.
What steps will reproduce the problem?
- create a new repository
- make an initial commit
- branch the initial commit
- commit change on the branch
- commit change on master
- merge branch to master
- add the new repository as a remote of an unrelated repository (preferably with a lot of history)
- fetch the new remote
- merge the master branch of the remote with a branch of the unrelated repsository using --allow-unrelated-histories
- check the log of the branch in the unrelated repository, and see an infinite line run from the initial commit of the branch from your new repository
What is the expected output? What do you see instead?
The history line of the log window should stop at the initial branched commit when it is the root
What version of TortoiseGit and Git are you using? On what operating system?