Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep path references in merge_file_from_index #520

Merged
merged 1 commit into from
May 3, 2015
Merged

Keep path references in merge_file_from_index #520

merged 1 commit into from
May 3, 2015

Commits on Apr 23, 2015

  1. Keep path references in merge_file_from_index 

    IndexEntry._to_c requires its caller to hold a reference to the path it
returns until it no longer needs the C structure.
Repository.merge_file_from_index was not doing so, causing the merge
text to contain garbage from freed memory in some cases.
    @cjwatson
    cjwatson committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    efb49f8 View commit details
    Browse the repository at this point in the history