Skip to content

Bump libgit2 - #359

Merged
mdiep merged 1 commit into
masterfrom
bump-libgit2
Apr 21, 2014
Merged

Bump libgit2#359
mdiep merged 1 commit into
masterfrom
bump-libgit2

Conversation

@jspahrsummers

Copy link
Copy Markdown
Contributor

Compare these two pins.

This brings in libgit2/libgit2#2269, libgit2/libgit2#2108, and libgit2/libgit2#2279 to fix issues with ignores, attributes, and index thread safety. These changes are important, but fairly significant undertakings.

@mdiep

mdiep commented Apr 21, 2014

Copy link
Copy Markdown
Contributor

The only minor thing that I see is that the return type of git_clear_index has been changed to indicate whether it was successful. We should probably use that. But since that's not a regression, it'd be fine to open an issue for this and do it later.

Apart from making sure that we're up to date in our usage of the APIs, I don't see any reason not to merge this to master.

@jspahrsummers

Copy link
Copy Markdown
Contributor Author

👍 Filed as #361.

@arrbee

arrbee commented Apr 21, 2014

Copy link
Copy Markdown
Member

The only minor thing that I see is that the return type of git_clear_index has been changed to indicate whether it was successful. We should probably use that. But since that's not a regression, it'd be fine to open an issue for this and do it later.

Just for reference, the rationale for that change is that the index now uses deferred deletes for index entries if there is a concurrent diff running using the index. In theory the bookkeeping logic for the deferred delete could have a failed memory allocation so we had to add an error return.

Since I think that y'all will not concurrently modify the index with a diff in progress on another thread, this function should never actually return an error.

@mdiep mdiep self-assigned this Apr 21, 2014
mdiep added a commit that referenced this pull request Apr 21, 2014
@mdiep
mdiep merged commit 11a05fb into master Apr 21, 2014
@mdiep
mdiep deleted the bump-libgit2 branch April 21, 2014 18:34
@jspahrsummers

Copy link
Copy Markdown
Contributor Author

@arrbee 💎 Thanks for explaining!

phatblat pushed a commit to phatblat/objective-git that referenced this pull request Sep 13, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants