Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This fixes a minor memory leak (detected by LeakSanitizer) in git merge.
To reproduce (with an ASAN build): ``` mkdir test cd test git init echo x > x.txt git add . git commit -m "WIP" git checkout -b dev echo y > x.txt git add . git commit -m "WIP" git checkout main echo z > x.txt git add . git commit -m "WIP" echo a > x.txt git add . git merge dev ``` The fix is to call free_commit_list(merge_bases) when an error occurs. Signed-off-by: Kevin Backhouse <kevinbackhouse@github.com>
- Loading branch information