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.

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

[WIP] Git2 framework #570

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
7c890ad
Properly ignore xcuserdata
phatblat Mar 31, 2016
3d9bbba
Add git2 project
phatblat Mar 31, 2016
4043182
Update relative paths in run scripts
phatblat Apr 1, 2016
dded14a
Add new libgit2 source files
phatblat Apr 1, 2016
696f9fd
Add git2 subproject
phatblat Apr 1, 2016
a687ea1
Remove libgit2 workspace reference
phatblat Apr 1, 2016
c7ca3e9
Prevent sys folder from getting included as a resource folder
phatblat Apr 1, 2016
7c106f4
Exclude libgit2 headers from ObjectiveGit build
phatblat Apr 1, 2016
ccb3b41
Remove libgit2 headers from modulepam
phatblat Apr 1, 2016
3113489
Change git2 imports from local to global includes
phatblat Apr 1, 2016
b0c42cb
Remove static library targets from ObjectiveGit project
phatblat Apr 1, 2016
24cc905
Remove static lib linker flags, header paths, link to git2.framework
phatblat Apr 1, 2016
ee9956b
Disable CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES
phatblat Apr 1, 2016
fb6aab1
Update libgit2 to 0.24
phatblat Apr 1, 2016
3eb46da
Non-modular include it is
phatblat Apr 1, 2016
c81ecfc
Remove merge_driver
phatblat Apr 1, 2016
c84f1c9
Add git2/sys headers, move refdb.h to project
phatblat Apr 1, 2016
ba2f288
Exclude license file from project
phatblat Apr 1, 2016
0bcb8b7
Remove LIBRARY_SEARCH_PATHS
phatblat Apr 1, 2016
6b03465
Remove linking to static libraries from ObjectiveGit
phatblat Apr 1, 2016
1825f3e
Enable APPLICATION_EXTENSION_API_ONLY
phatblat Apr 1, 2016
329a3e0
Dial back warnings
phatblat Apr 1, 2016
3fecc9a
Merge branch 'master' into git2_framework
phatblat Apr 11, 2016
8ab0669
Remove libgit2 folder reference
phatblat Apr 11, 2016
5f5a849
Remove git2.h and left-over build settings from ObjectiveGit
phatblat Apr 11, 2016
d95a70e
Remove git2.h import from ObjectiveGit umbrella header
phatblat Apr 11, 2016
cfa29a3
Replace git2.h imports with git2 module import
phatblat Apr 11, 2016
9fd64d5
Enable GIT_THREADS
phatblat Apr 11, 2016
4cfd647
Enable GIT_SSH
phatblat Apr 11, 2016
a45a28c
Update libssh2 to 1.7.0 for iOS
phatblat Apr 11, 2016
8663556
Fix git2-Mac linking with libssh2
phatblat Apr 11, 2016
a861aaf
Add header notes to old libgit2 build scripts
phatblat Apr 11, 2016
ddeff3f
Change git2-Mac to use libssh2.a instead of dylib
phatblat Apr 11, 2016
42741e8
Enable GIT_USE_ICONV
phatblat Apr 11, 2016
6386671
Disable warnings about incompatible pointer types from git2
phatblat Apr 11, 2016
849fb0e
Add NSDate+GTTimeAdditions.h to public iOS headers
phatblat Apr 11, 2016
e1a749c
Set deployment target to 8.0 for all iOS targets
phatblat Apr 12, 2016
aec6981
Merge branch 'master' into git2_framework
phatblat May 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ External/libgit2-ios
*.mode2v3

project.xcworkspace
*/xcuserdata/
xcuserdata/
*.xccheckout
*.xcscmblueprint

Expand All @@ -31,4 +31,3 @@ External/ios-openssl/lib
External/libssh2-ios

Carthage/Build

2 changes: 1 addition & 1 deletion External/libssh2
Submodule libssh2 updated 159 files
135 changes: 0 additions & 135 deletions ObjectiveGit.modulemap
Original file line number Diff line number Diff line change
@@ -1,141 +1,6 @@
framework module ObjectiveGit {
umbrella header "ObjectiveGit.h"

header "git2/attr.h"
header "git2/blob.h"
header "git2/blame.h"
header "git2/branch.h"
header "git2/buffer.h"
header "git2/checkout.h"
header "git2/cherrypick.h"
header "git2/clone.h"
header "git2/commit.h"
header "git2/common.h"
header "git2/config.h"
header "git2/describe.h"
header "git2/diff.h"
header "git2/errors.h"
header "git2/filter.h"
header "git2/graph.h"
header "git2/ignore.h"
header "git2/index.h"
header "git2/indexer.h"
header "git2/merge.h"
header "git2/message.h"
header "git2/net.h"
header "git2/notes.h"
header "git2/object.h"
header "git2/odb.h"
header "git2/odb_backend.h"
header "git2/oid.h"
header "git2/pack.h"
header "git2/patch.h"
header "git2/pathspec.h"
header "git2/refdb.h"
header "git2/reflog.h"
header "git2/refs.h"
header "git2/refspec.h"
header "git2/remote.h"
header "git2/repository.h"
header "git2/reset.h"
header "git2/revert.h"
header "git2/revparse.h"
header "git2/revwalk.h"
header "git2/signature.h"
header "git2/stash.h"
header "git2/status.h"
header "git2/submodule.h"
header "git2/tag.h"
header "git2/transport.h"
header "git2/tree.h"
header "git2/types.h"
header "git2/version.h"
header "git2/sys/commit.h"
header "git2/sys/config.h"
header "git2/sys/diff.h"
header "git2/sys/filter.h"
header "git2/sys/hashsig.h"
header "git2/sys/index.h"
header "git2/sys/mempack.h"
header "git2/sys/odb_backend.h"
header "git2/sys/refdb_backend.h"
header "git2/sys/reflog.h"
header "git2/sys/refs.h"
header "git2/sys/repository.h"
header "git2/sys/transport.h"
header "git2/cred_helpers.h"
header "git2/sys/openssl.h"
header "git2/sys/stream.h"
header "git2/trace.h"

exclude header "git2/inttypes.h"
exclude header "git2/stdint.h"
exclude header "git2/sys/git2/annotated_commit.h"
exclude header "git2/sys/git2/attr.h"
exclude header "git2/sys/git2/blame.h"
exclude header "git2/sys/git2/blob.h"
exclude header "git2/sys/git2/branch.h"
exclude header "git2/sys/git2/buffer.h"
exclude header "git2/sys/git2/checkout.h"
exclude header "git2/sys/git2/cherrypick.h"
exclude header "git2/sys/git2/clone.h"
exclude header "git2/sys/git2/commit.h"
exclude header "git2/sys/git2/cred_helpers.h"
exclude header "git2/sys/git2/describe.h"
exclude header "git2/sys/git2/errors.h"
exclude header "git2/sys/git2/global.h"
exclude header "git2/sys/git2/graph.h"
exclude header "git2/sys/git2/ignore.h"
exclude header "git2/sys/git2/index.h"
exclude header "git2/sys/git2/indexer.h"
exclude header "git2/sys/git2/inttypes.h"
exclude header "git2/sys/git2/merge.h"
exclude header "git2/sys/git2/message.h"
exclude header "git2/sys/git2/notes.h"
exclude header "git2/sys/git2/object.h"
exclude header "git2/sys/git2/odb_backend.h"
exclude header "git2/sys/git2/oidarray.h"
exclude header "git2/sys/git2/pack.h"
exclude header "git2/sys/git2/patch.h"
exclude header "git2/sys/git2/pathspec.h"
exclude header "git2/sys/git2/rebase.h"
exclude header "git2/sys/git2/refdb.h"
exclude header "git2/sys/git2/reflog.h"
exclude header "git2/sys/git2/refs.h"
exclude header "git2/sys/git2/refspec.h"
exclude header "git2/sys/git2/remote.h"
exclude header "git2/sys/git2/repository.h"
exclude header "git2/sys/git2/reset.h"
exclude header "git2/sys/git2/revert.h"
exclude header "git2/sys/git2/revparse.h"
exclude header "git2/sys/git2/revwalk.h"
exclude header "git2/sys/git2/signature.h"
exclude header "git2/sys/git2/stash.h"
exclude header "git2/sys/git2/stdint.h"
exclude header "git2/sys/git2/strarray.h"
exclude header "git2/sys/git2/submodule.h"
exclude header "git2/sys/git2/tag.h"
exclude header "git2/sys/git2/trace.h"
exclude header "git2/sys/git2/transaction.h"
exclude header "git2/sys/git2/transport.h"
exclude header "git2/sys/git2/tree.h"
exclude header "git2/sys/git2/version.h"
exclude header "git2/sys/git2/sys/commit.h"
exclude header "git2/sys/git2/sys/config.h"
exclude header "git2/sys/git2/sys/diff.h"
exclude header "git2/sys/git2/sys/filter.h"
exclude header "git2/sys/git2/sys/hashsig.h"
exclude header "git2/sys/git2/sys/index.h"
exclude header "git2/sys/git2/sys/mempack.h"
exclude header "git2/sys/git2/sys/odb_backend.h"
exclude header "git2/sys/git2/sys/openssl.h"
exclude header "git2/sys/git2/sys/refdb_backend.h"
exclude header "git2/sys/git2/sys/reflog.h"
exclude header "git2/sys/git2/sys/refs.h"
exclude header "git2/sys/git2/sys/repository.h"
exclude header "git2/sys/git2/sys/stream.h"
exclude header "git2/sys/git2/sys/transport.h"

export *
module * { export * }
}
2 changes: 1 addition & 1 deletion ObjectiveGit/Categories/NSArray+StringArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/strarray.h"
#import <git2/strarray.h>

@interface NSArray (StringArray)

Expand Down
4 changes: 2 additions & 2 deletions ObjectiveGit/Categories/NSData+Git.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//

#import <Foundation/Foundation.h>
#import "git2/buffer.h"
#import "git2/oid.h"
#import <git2/buffer.h>
#import <git2/oid.h>

@interface NSData (Git)

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/Categories/NSData+Git.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#import "NSData+Git.h"
#import "NSError+Git.h"

#import "git2/errors.h"
#import <git2/errors.h>

@implementation NSData (Git)

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/Categories/NSDate+GTTimeAdditions.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/types.h"
#import <git2/types.h>

@interface NSDate (GTTimeAdditions)

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/Categories/NSError+Git.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
//

#import "NSError+Git.h"
#import "git2/errors.h"
#import <git2/errors.h>

NSString * const GTGitErrorDomain = @"GTGitErrorDomain";

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTBlame.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/blame.h"
#import <git2/blame.h>

@class GTBlameHunk;
@class GTRepository;
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTBlameHunk.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/blame.h"
#import <git2/blame.h>

@class GTOID;
@class GTSignature;
Expand Down
4 changes: 2 additions & 2 deletions ObjectiveGit/GTBlob.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#import "NSError+Git.h"
#import "NSString+Git.h"

#import "git2/blob.h"
#import "git2/errors.h"
#import <git2/blob.h>
#import <git2/errors.h>

@implementation GTBlob

Expand Down
6 changes: 3 additions & 3 deletions ObjectiveGit/GTBranch.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#import "GTRepository.h"
#import "NSError+Git.h"

#import "git2/branch.h"
#import "git2/errors.h"
#import "git2/graph.h"
#import <git2/branch.h>
#import <git2/errors.h>
#import <git2/graph.h>

@implementation GTBranch

Expand Down
6 changes: 3 additions & 3 deletions ObjectiveGit/GTCommit.m
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
#import "GTOID.h"
#import "GTIndex.h"

#import "git2/commit.h"
#import "git2/errors.h"
#import "git2/merge.h"
#import <git2/commit.h>
#import <git2/errors.h>
#import <git2/merge.h>

@implementation GTCommit

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTConfiguration.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/types.h"
#import <git2/types.h>

@class GTRemote;
@class GTRepository;
Expand Down
6 changes: 3 additions & 3 deletions ObjectiveGit/GTConfiguration.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#import "NSData+Git.h"
#import "NSError+Git.h"

#import "git2/config.h"
#import "git2/errors.h"
#import "git2/buffer.h"
#import <git2/config.h>
#import <git2/errors.h>
#import <git2/buffer.h>

@interface GTConfiguration ()
@property (nonatomic, readonly, assign) git_config *git_config;
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTCredential.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/transport.h"
#import <git2/transport.h>

/// An enum describing the data needed for authentication.
/// See `git_credtype_t`.
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTCredential.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "GTCredential+Private.h"
#import "NSError+Git.h"

#import "git2/errors.h"
#import <git2/errors.h>

typedef GTCredential *(^GTCredentialProviderBlock)(GTCredentialType allowedTypes, NSString *URL, NSString *userName);

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiff.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/diff.h"
#import <git2/diff.h>
#import "GTDiffDelta.h"

@class GTDiffDelta;
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiff.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#import "EXTScope.h"

#import "git2/errors.h"
#import <git2/errors.h>

NSString *const GTDiffOptionsFlagsKey = @"GTDiffOptionsFlagsKey";
NSString *const GTDiffOptionsContextLinesKey = @"GTDiffOptionsContextLinesKey";
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiffDelta.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/diff.h"
#import <git2/diff.h>
#import "GTDiffFile.h"

@class GTBlob;
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiffDelta.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "GTDiffPatch.h"
#import "NSError+Git.h"

#import "git2/errors.h"
#import <git2/errors.h>

@interface GTDiffDelta ()

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiffFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/diff.h"
#import <git2/diff.h>

/// Flags which may be set on the file.
///
Expand Down
4 changes: 2 additions & 2 deletions ObjectiveGit/GTDiffHunk.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#import "GTDiffPatch.h"
#import "NSError+Git.h"

#import "git2/errors.h"
#import "git2/patch.h"
#import <git2/errors.h>
#import <git2/patch.h>

@interface GTDiffHunk ()

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiffLine.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/diff.h"
#import <git2/diff.h>

/// A character representing the origin of a given line.
///
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTDiffPatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import <Foundation/Foundation.h>
#import "git2/patch.h"
#import <git2/patch.h>

@class GTDiffHunk;
@class GTDiffDelta;
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTEnumerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#import <Foundation/Foundation.h>
#import "GTObject.h"
#import "git2/revwalk.h"
#import <git2/revwalk.h>

/// Options to specify enumeration order when enumerating through a repository.
/// With the exception of GTEnumeratorOptionsNone, the values here can be ORed
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGit/GTEnumerator.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#import "GTRepository+Private.h"
#import "GTOID.h"

#import "git2/errors.h"
#import <git2/errors.h>

@interface GTEnumerator ()

Expand Down
Loading