Update libgit2 to 9bbc8f3 by nulltoken · Pull Request #965 · libgit2/libgit2sharp

nulltoken · 2015-02-18T20:11:37Z

libgit2/libgit2@e0902fb...9bbc8f3

nulltoken · 2015-02-18T20:12:18Z

This is an attempt at troubleshooting #961 build issues on Mac Os X

nulltoken · 2015-02-18T21:02:27Z

😿

@carlosmn @Therzok Any idea? Can you reproduce this locally?

Therzok · 2015-02-18T23:09:43Z

Nope. Yep.

nulltoken · 2015-02-19T10:19:58Z

I'll work on bisecting this.

nulltoken · 2015-02-20T13:43:38Z

Mac Os X build passes against libgit2/libgit2@b23c206
Mac Os X build fails against libgit2/libgit2@a291790

So this issue lies somewhere in libgit2/libgit2@b23c206...a291790

As shown in libgit2/libgit2#2917, the issue is put under the light through the -DCMAKE_OSX_ARCHITECTURES=i386;x86_64 option.

/cc @jeffhostetler @ethomson @carlosmn @Therzok Any idea?

nulltoken · 2015-02-20T15:34:47Z

Updated to target @jeffhostetler 's libgit2/libgit2#2919

nulltoken · 2015-03-04T14:48:55Z

/cc @jamill @ammeep I'm wip-upgrading the libgit2 binaries. I should be done soon-ish

Therzok · 2015-03-04T15:30:11Z

nulltoken · 2015-03-04T19:01:59Z

Ok. Now that builds locally. Let's see how many tests are broken now...

nulltoken · 2015-03-04T19:03:02Z

FWIW, there are a ton of breaking changes (and I see no easy way of providing a deprecating path that would actually be useful)...

nulltoken · 2015-03-04T19:04:20Z

Regarding the identity which is going to be used for reflog messages, I was thinking about adding an entry to RepositoryOptions and CloneOptions.

Thoughts?

nulltoken · 2015-03-16T17:02:12Z

Ok. This is ugly. But.. this is the first build that passes!

@carlosmn @ethomson @jamill @Therzok Would you please take a look at this and provide me with an early feedback?

Therzok · 2015-03-16T18:02:58Z

o-shi---

Grabbing coffee.

Therzok · 2015-03-16T18:27:18Z

I have a few things I want to put in for discussion:

Signature should have a constructor that takes an identity and uses DateTimeOffset.Now as time.
We should enforce Identity in the RepositoryOptions constructor.

More to come.

carlosmn · 2015-03-16T19:14:33Z

It looks good to me as far as the delegation to libgit2 goes, though I notice the methods in Proxy do not have the _from_ infix for creating from an annotated commit.

The mess with UpdateHeadTarget() seems to stem from the special-casing you have for "HEAD", allowing it to point to an arbitrary reference, whereas no other symref is allowed to do that. Personally I would favour not checking for the existence of the target. If a caller wants to make sure it exists, they can look it up and pass the Reference themselves (not that this really solves anything, as it's still subject to race conditions on the target existing).

The current scheme may already be broken for allowing a remote-tracking HEAD to point to a branch which you know is coming.

nulltoken · 2015-03-16T19:54:50Z

I've extracted some fixes into #997

A reduced diff can be examined at ntk/deprecate...ntk/upgrade_binaries

nulltoken · 2015-03-16T20:47:42Z

Signature should have a constructor that takes an identity and uses DateTimeOffset.Now as time.

@Therzok Fixed

We should enforce Identity in the RepositoryOptions constructor.

Meaning, make it mandatory?

nulltoken · 2015-03-16T20:47:55Z

It looks good to me as far as the delegation to libgit2 goes, though I notice the methods in Proxy do not have the from infix for creating from an annotated commit.

@carlosmn Fixed

Therzok · 2015-03-16T22:21:12Z

I'm not sure, but from my experience, not setting an Identity/Signature failed to commit. (even though I had a global config set up)

With this Identity class, we can probably set up just the user/email and make lg2s do the time resolution based on the actual system time.

Just my $0.02. I'm not sure this would actually work every time.

libgit2/libgit2@e0902fb...9bbc8f3

nulltoken · 2015-03-17T19:17:40Z

I'm not sure, but from my experience, not setting an Identity/Signature failed to commit. (even though I had a global config set up)

@Therzok That's really weird. Could you please try to check this against this version?

nulltoken · 2015-03-17T19:18:22Z

FWIW, I've cleaned up the PR and rebased it.

Final comments before merge?

Therzok · 2015-03-17T19:25:54Z

When I get back to redoing some bits of the libgit2 port of XS, I'll take a look at it again. Until then, stay tuned.

nulltoken · 2015-03-20T18:23:06Z

Published as a NuGet pre-relase package LibGit2Sharp 0.22.0-pre20150317225305

nulltoken added a commit to libgit2/libgit2 that referenced this pull request Feb 20, 2015

try to repro libgit2/libgit2sharp#965

dd1e7bb

nulltoken added a commit to libgit2/libgit2 that referenced this pull request Feb 20, 2015

fixup! try to repro libgit2/libgit2sharp#965

099098c

nulltoken added a commit to libgit2/libgit2 that referenced this pull request Feb 20, 2015

fixup! fixup! try to repro libgit2/libgit2sharp#965

9dfd0a1

nulltoken added a commit to libgit2/libgit2 that referenced this pull request Feb 20, 2015

fixup! fixup! try to repro libgit2/libgit2sharp#965

95dcf63

nulltoken mentioned this pull request Feb 20, 2015

Fix Mac 32 bit build problem described in libgit2/libgit2#2917 libgit2/libgit2#2919

Merged

nulltoken force-pushed the ntk/upgrade_binaries branch from bc176c7 to 0b68179 Compare February 21, 2015 13:53

nulltoken changed the title ~~Update libgit2 to 437ba9a~~ Update libgit2 to 366e53d Feb 21, 2015

nulltoken force-pushed the ntk/upgrade_binaries branch from 0b68179 to 43ca2bf Compare March 4, 2015 14:45

nulltoken changed the title ~~Update libgit2 to 366e53d~~ Update libgit2 to bdf0e73 Mar 4, 2015

Therzok reviewed Mar 4, 2015
View reviewed changes

This was referenced Mar 4, 2015

We should provide an annotated version for set_head() and set_head_detached() libgit2/libgit2#2949

Closed

branch: fix generated reflog messages upon branch creation and renaming libgit2/libgit2#2950

Merged

nulltoken force-pushed the ntk/upgrade_binaries branch 5 times, most recently from 09dbebb to 1282a97 Compare March 8, 2015 19:08

nulltoken force-pushed the ntk/upgrade_binaries branch from 46a0c55 to 8979c01 Compare March 16, 2015 19:51

nulltoken changed the title ~~Update libgit2 to bdf0e73~~ Update libgit2 to 8acf058 Mar 16, 2015

nulltoken force-pushed the ntk/upgrade_binaries branch 2 times, most recently from 8a837aa to 9e7a993 Compare March 16, 2015 20:26

nulltoken mentioned this pull request Mar 16, 2015

Deprecate ReflogEntry.Commiter in favor of ReflogEntry.Committer #997

Merged

nulltoken force-pushed the ntk/upgrade_binaries branch 3 times, most recently from a5d60a5 to f53997c Compare March 17, 2015 07:16

nulltoken mentioned this pull request Mar 17, 2015

Add annotated versions of ref-modying functions libgit2/libgit2#2962

Merged

nulltoken force-pushed the ntk/upgrade_binaries branch from f53997c to dfaaf40 Compare March 17, 2015 15:41

nulltoken changed the title ~~Update libgit2 to 8acf058~~ Update libgit2 to 9bbc8f3 Mar 17, 2015

nulltoken added 2 commits March 17, 2015 19:56

Introduce Identity type

964943b

Update libgit2 to 9bbc8f3

d8a04a4

libgit2/libgit2@e0902fb...9bbc8f3

nulltoken force-pushed the ntk/upgrade_binaries branch from dfaaf40 to d8a04a4 Compare March 17, 2015 18:59

nulltoken merged commit d8a04a4 into vNext Mar 17, 2015

nulltoken deleted the ntk/upgrade_binaries branch March 17, 2015 21:56

nulltoken added this to the v0.22 milestone Mar 18, 2015

nulltoken mentioned this pull request Mar 20, 2015

DivideByZeroException is thrown during diff commits #979

Closed

nulltoken added the nuget-pre label Mar 20, 2015

dahlbyk mentioned this pull request Jun 10, 2015

Consistent signature/logMessage usage #655

Closed

Uh oh!

Conversation

nulltoken commented Feb 18, 2015

Uh oh!

nulltoken commented Feb 18, 2015

Uh oh!

nulltoken commented Feb 18, 2015

Uh oh!

Therzok commented Feb 18, 2015

Uh oh!

nulltoken commented Feb 19, 2015

Uh oh!

nulltoken commented Feb 20, 2015

Uh oh!

nulltoken commented Feb 20, 2015

Uh oh!

nulltoken commented Mar 4, 2015

Uh oh!

Therzok Mar 4, 2015

Choose a reason for hiding this comment

Uh oh!

nulltoken Mar 4, 2015

Choose a reason for hiding this comment

Uh oh!

nulltoken commented Mar 4, 2015

Uh oh!

nulltoken commented Mar 4, 2015

Uh oh!

nulltoken commented Mar 4, 2015

Uh oh!

nulltoken commented Mar 16, 2015

Uh oh!

Therzok commented Mar 16, 2015

Uh oh!

Therzok commented Mar 16, 2015

Uh oh!

carlosmn commented Mar 16, 2015

Uh oh!

nulltoken commented Mar 16, 2015

Uh oh!

nulltoken commented Mar 16, 2015

Uh oh!

nulltoken commented Mar 16, 2015

Uh oh!

Therzok commented Mar 16, 2015

Uh oh!

nulltoken commented Mar 17, 2015

Uh oh!

nulltoken commented Mar 17, 2015

Uh oh!

Therzok commented Mar 17, 2015

Uh oh!

nulltoken commented Mar 20, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants