Skip to content

Commit 00cb9c6

Browse files
author
Rowan James
committed
Change to using trunk of github/libgit2/libgit2, and use a separate target to update it and build it from within Xcode
1 parent 45247d0 commit 00cb9c6

File tree

132 files changed

+603
-14996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+603
-14996
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "libgit2"]
2-
path = libgit2
3-
url = http://github.com/pieter/libgit2.git
2+
path = libgit2
3+
url = https://github.com/libgit2/libgit2.git

GitX.xcodeproj/project.pbxproj

Lines changed: 592 additions & 257 deletions
Large diffs are not rendered by default.

PBGitGrapher.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import "PBGitLane.h"
1212
#import "PBGitGraphLine.h"
1313
#import <list>
14-
#import "git/oid.h"
14+
#import <git2/oid.h>
1515
#include <algorithm>
1616

1717
using namespace std;

PBGitLane.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright 2008 __MyCompanyName__. All rights reserved.
77
//
88
#import <Cocoa/Cocoa.h>
9-
#include "git/oid.h"
9+
#include <git2/oid.h>
1010

1111
class PBGitLane {
1212
static int s_colorIndex;
@@ -24,7 +24,7 @@ class PBGitLane {
2424

2525
PBGitLane(NSString *sha)
2626
{
27-
git_oid_mkstr(&d_sha, [sha UTF8String]);
27+
git_oid_fromstr(&d_sha, [sha UTF8String]);
2828
d_index = s_colorIndex++;
2929
}
3030

PBGitRevList.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
148148
}
149149

150150
git_oid oid;
151-
git_oid_mkstr(&oid, sha.c_str());
151+
git_oid_fromstr(&oid, sha.c_str());
152152
PBGitCommit *newCommit = [PBGitCommit commitWithRepository:repository andSha:[PBGitSHA shaWithOID:oid]];
153153

154154
string author;

PBGitSHA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import <Cocoa/Cocoa.h>
10-
#include "git/oid.h"
10+
#include <git2/oid.h>
1111

1212

1313
@interface PBGitSHA : NSObject <NSCopying> {

PBGitSHA.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#import "PBGitSHA.h"
1010

11+
#import <git2/errors.h>
1112

1213
@interface PBGitSHA ()
1314

@@ -32,7 +33,7 @@ + (PBGitSHA *)shaWithOID:(git_oid)oid
3233
+ (PBGitSHA *)shaWithString:(NSString *)shaString
3334
{
3435
git_oid oid;
35-
int err = git_oid_mkstr(&oid, [shaString UTF8String]);
36+
int err = git_oid_fromstr(&oid, [shaString UTF8String]);
3637
if (err == GIT_ENOTOID)
3738
return nil;
3839

@@ -43,7 +44,7 @@ + (PBGitSHA *)shaWithString:(NSString *)shaString
4344
+ (PBGitSHA *)shaWithCString:(const char *)shaCString
4445
{
4546
git_oid oid;
46-
int err = git_oid_mkstr(&oid, shaCString);
47+
int err = git_oid_fromstr(&oid, shaCString);
4748
if (err == GIT_ENOTOID)
4849
return nil;
4950

build_libgit2.sh

Lines changed: 0 additions & 52 deletions
This file was deleted.

libgit2

Submodule libgit2 added at a7e34e3

libgit2/.HEADER

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)