Update libgit2 to 19ae843 by Therzok · Pull Request #870 · libgit2/libgit2sharp

Therzok · 2014-11-14T17:29:09Z

Therzok · 2014-11-14T17:30:33Z

git_status_file has been changed to make an exact match.

Therzok · 2014-11-14T18:15:29Z

While AppVeyor passed, Travis failed. https://travis-ci.org/libgit2/libgit2sharp/builds/41021886

Therzok · 2014-11-14T18:34:28Z

libgit2/libgit2@82374d9 added API which can replace Branch.RemoteNameFromLocalBranch but it seems to return -1 when it doesn't find anything and that's not safe to use when treating errors.

Therzok · 2014-11-15T12:37:01Z

libgit2/libgit2#2709 is a PR to fix the travis issues.

Therzok · 2014-11-15T19:02:04Z

Found the cause after a lot of debugging with console runner and when we unload the app domain in CanProbeForNativeBinariesFromAShadowCopiedAssembly we screw up and end up with a double free in openssl locks.

So after we have
init AppDomain1
init AppDomain2
shutdown AppDomain2
shutdown AppDomain1

We get an error in code. Phew, this was frustrating.

/cc @carlosmn @ethomson

Therzok · 2014-11-15T19:50:47Z

The commit above is a horrible hack. We need a way to expose this initializing to the end user. And need to explicitly state that this is available and should be done once and only once.

Therzok · 2014-11-15T19:52:02Z

/cc @nulltoken @dahlbyk

nulltoken · 2014-11-15T20:38:58Z

And need to explicitly state that this is available and should be done once and only once.

Couldn't we query libgit2 to check if it has already been done? /cc @carlosmn

Therzok · 2014-11-17T04:45:18Z

@nulltoken on the C# side, we've pretty much fixed this case. But I still consider it a hack and the end user should do it.

We should also look into moving the http(s) backends into managed code.

ethomson · 2014-11-17T15:31:38Z

What happens when you have two app domains using libgit2sharp but neither is the default app domain?

Would making git_libgit2_init return the initialization state (ie, are you the first caller) help here?

That's why I said it's a horrible hack. That could work also.

So, do we have a solution for this?

Sorry it took so long here, with libgit2/libgit2#2743 merged, I think we should have a solution here. Would you mind trying it out?

Yeah, I will do that later today. <3

In fact, windows machine is dead. Need to wait a bit more. (Tomorrow mornin'!)

Therzok · 2014-11-19T02:20:58Z

I'll bump the native functions further and bind git_push too.

ethomson · 2014-12-03T20:29:52Z

@Therzok I think that libgit2/libgit2#2743 should help with the first-time initialization?

nulltoken · 2014-12-03T20:37:32Z

@ethomson 😍

Therzok · 2014-12-08T01:05:52Z

I'm in the progress of updating. TODO:

Update binaries.
Find out how to implement the EPEEL changes. Pl0x halp meh or hop on the PR.
Fix tests
Implement git_remote_push
Implement Note Author and Committer for Note. - Someone forgot this when bumping libs last time.
Find out what git_remote_disconnect comment means. /cc @carlosmn
Open an issue after this to implement git_remote_rebase

Edit: Bumping the libs resulted in:
CanCloneBarely attempting to read or write protected memory on Windows.
The lack of know-how on my side to fix this PEEL mess.
DoesNotReportRemotesWithAlreadyExistingRefSpec dying in native land on Mono.

Therzok · 2014-12-08T01:44:19Z

I need more eyes here, I must've missed something from 65f6c1c to 19ae843.

libgit2/libgit2@3f8d005...19ae843

Therzok · 2014-12-08T18:39:57Z

@nulltoken Sir, your expertise is required, Sir!

Therzok · 2014-12-08T21:48:19Z

@nulltoken I don't know what you did, but this is me after seeing both CI statuses.

nulltoken · 2014-12-08T22:01:40Z

@Therzok I did notthing. GitHub did (cf. https://github.com/blog/1935-see-results-from-all-pull-request-status-checks) 😉

Therzok · 2014-12-08T22:20:59Z

@nulltoken Ah. I see. Now help! :D

nulltoken · 2014-12-08T22:25:46Z

@Therzok I had kind of an emergency to deal with in the past hours and haven't been able to take a look at it yet. 😕

I'll take a look tomorrow!

Therzok · 2014-12-08T22:28:46Z

@nulltoken I was just kidding. No worries, awaiting review patiently.

ethomson · 2014-12-10T17:27:30Z

You need to pick up the change to git_remote_callbacks from libgit2/libgit2@3149547

ethomson · 2014-12-10T17:30:06Z

diff --git a/LibGit2Sharp/Core/GitRemoteCallbacks.cs b/LibGit2Sharp/Core/GitRemoteCallbacks.cs
index 3aec0bf..805ba84 100644
--- a/LibGit2Sharp/Core/GitRemoteCallbacks.cs
+++ b/LibGit2Sharp/Core/GitRemoteCallbacks.cs
@@ -23,6 +23,12 @@ internal struct GitRemoteCallbacks

         internal NativeMethods.remote_update_tips_callback update_tips;

+        internal NativeMethods.git_packbuilder_progress pack_progress;
+
+        internal NativeMethods.git_push_transfer_progress push_transfer_progress;
+
+        internal IntPtr push_update_reference;
+
         internal IntPtr payload;
     }
 }

Therzok · 2014-12-10T22:31:40Z

Should we close this if the new PR is up?

Therzok reviewed Nov 14, 2014
View reviewed changes

Comment thread LibGit2Sharp.Tests/StatusFixture.cs

Therzok Nov 14, 2014

Copy link
Copy Markdown

Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git_status_file has been changed to make an exact match.

ethomson reviewed Nov 17, 2014
View reviewed changes

Therzok force-pushed the therzok/upgradeBinaries branch from d8e21a5 to 12ace0a Compare December 8, 2014 01:06

Therzok changed the title ~~Update libgit2 to 65f6c1c~~ Update libgit2 to 19ae843 Dec 8, 2014

Therzok force-pushed the therzok/upgradeBinaries branch 2 times, most recently from 9df5e54 to 7f68afb Compare December 8, 2014 01:16

Therzok added 2 commits December 8, 2014 04:36

Update libgit2 to 19ae843

f74b3d9

libgit2/libgit2@3f8d005...19ae843

Fix Diff Lines truncation.

b477cf2

Therzok force-pushed the therzok/upgradeBinaries branch from ca09ce2 to b477cf2 Compare December 8, 2014 02:37

Therzok mentioned this pull request Dec 8, 2014

Throw NotFound and CannotDereference Exceptions - Reborn #842

Merged

Therzok closed this Dec 10, 2014

nulltoken added this to the UnmergedOrDoNotRequireAFix milestone Dec 22, 2014

nulltoken deleted the therzok/upgradeBinaries branch June 11, 2015 16:00

Uh oh!

Conversation

Therzok commented Nov 14, 2014

Uh oh!

Therzok Nov 14, 2014

Choose a reason for hiding this comment

Uh oh!

Therzok commented Nov 14, 2014

Uh oh!

Therzok commented Nov 14, 2014

Uh oh!

Therzok commented Nov 15, 2014

Uh oh!

Therzok commented Nov 15, 2014

Uh oh!

Therzok commented Nov 15, 2014

Uh oh!

Therzok commented Nov 15, 2014

Uh oh!

nulltoken commented Nov 15, 2014

Uh oh!

Therzok commented Nov 17, 2014

Uh oh!

ethomson Nov 17, 2014

Choose a reason for hiding this comment

Uh oh!

Therzok Nov 17, 2014

Choose a reason for hiding this comment

Uh oh!

Therzok Dec 2, 2014

Choose a reason for hiding this comment

Uh oh!

ethomson Dec 5, 2014

Choose a reason for hiding this comment

Uh oh!

Therzok Dec 5, 2014

Choose a reason for hiding this comment

Uh oh!

Therzok Dec 6, 2014

Choose a reason for hiding this comment

Uh oh!

Therzok commented Nov 19, 2014

Uh oh!

ethomson commented Dec 3, 2014

Uh oh!

nulltoken commented Dec 3, 2014

Uh oh!

Therzok commented Dec 8, 2014

Uh oh!

Therzok commented Dec 8, 2014

Uh oh!

Therzok commented Dec 8, 2014

Uh oh!

Therzok commented Dec 8, 2014

Uh oh!

nulltoken commented Dec 8, 2014

Uh oh!

Therzok commented Dec 8, 2014

Uh oh!

nulltoken commented Dec 8, 2014

Uh oh!

Therzok commented Dec 8, 2014

Uh oh!

ethomson commented Dec 10, 2014

Uh oh!

ethomson commented Dec 10, 2014

Uh oh!

Therzok commented Dec 10, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants