Skip to content

merge-tree: Fix length checking for conflict parsing

Xing Xin requested to merge blanet/gitaly:xx/fix-length-checking-for-parsing-conflict-files into master

The length checking for conflicting file parsing can not protect us from a out-of-range panic if we received malformed output from git, though it can hardly happen.

Merge request reports