Skip to content

Commit

Permalink
Merge pull request #161 from libgit2/empty-name
Browse files Browse the repository at this point in the history
Bump libgit2 for empty signature fix
  • Loading branch information
joshaber committed May 13, 2013
2 parents 62d8486 + 540dd95 commit 447a256
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 deletions.
11 changes: 0 additions & 11 deletions Classes/GTRepository.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,8 @@ typedef void (^GTRepositoryStatusBlock)(NSURL *fileURL, GTRepositoryFileStatus s
// Lookup an object in the repo using a revparse spec
- (GTObject *)lookupObjectByRefspec:(NSString *)spec error:(NSError **)error;

// List references in the repository
//
// types - One or more GTReferenceTypes
// error(out) - will be filled if an error occurs
//
// returns an array of NSStrings holding the names of the references
// returns nil if an error occurred and fills the error parameter
- (NSArray *)referenceNamesWithTypes:(GTReferenceTypes)types error:(NSError **)error;

// List all references in the repository
//
// This is a convenience method for listReferencesInRepo: type:GTReferenceTypesListAll error:
//
// repository - The GTRepository to list references in
// error(out) - will be filled if an error occurs
//
Expand Down
8 changes: 2 additions & 6 deletions Classes/GTRepository.m
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,9 @@ - (NSArray *)localCommitsRelativeToRemoteBranch:(GTBranch *)remoteBranch error:(
return [localBranch uniqueCommitsRelativeToBranch:remoteBranch error:error];
}

- (NSArray *)referenceNamesWithTypes:(GTReferenceTypes)types error:(NSError **)error {
- (NSArray *)referenceNamesWithError:(NSError **)error {
git_strarray array;
int gitError = git_reference_list(&array, self.git_repository, types);
int gitError = git_reference_list(&array, self.git_repository);
if (gitError < GIT_OK) {
if (error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to list all references."];
return nil;
Expand All @@ -491,10 +491,6 @@ - (NSArray *)referenceNamesWithTypes:(GTReferenceTypes)types error:(NSError **)e
return references;
}

- (NSArray *)referenceNamesWithError:(NSError **)error {
return [self referenceNamesWithTypes:GTReferenceTypesListAll error:error];
}

- (GTRepository *)repository {
return self;
}
Expand Down
2 changes: 1 addition & 1 deletion libgit2
Submodule libgit2 updated 76 files
+3 −1 CMakeLists.txt
+1 −1 examples/general.c
+26 −18 include/git2/refs.h
+47 −17 include/git2/sys/refdb_backend.h
+4 −0 include/git2/types.h
+30 −27 src/branch.c
+0 −1 src/clone.c
+1 −1 src/commit.c
+1 −1 src/config_file.c
+1 −1 src/object.c
+1 −1 src/push.c
+45 −35 src/refdb.c
+4 −12 src/refdb.h
+108 −67 src/refdb_fs.c
+69 −15 src/refs.c
+19 −14 src/remote.c
+1 −1 src/repository.c
+1 −1 src/revwalk.c
+0 −6 src/signature.c
+1 −1 src/tag.c
+1 −1 src/transports/local.c
+6 −6 src/transports/smart_protocol.c
+1 −1 src/transports/winhttp.c
+7 −7 tests-clar/commit/signature.c
+3 −3 tests-clar/network/fetchlocal.c
+2 −2 tests-clar/refdb/inmemory.c
+37 −19 tests-clar/refdb/testdb.c
+26 −8 tests-clar/refs/branches/foreach.c
+7 −7 tests-clar/refs/foreachglob.c
+94 −0 tests-clar/refs/iterator.c
+2 −13 tests-clar/refs/list.c
+2 −2 tests-clar/refs/listall.c
+1 −0 tests-clar/resources/testrepo2/.gitted/HEAD
+14 −0 tests-clar/resources/testrepo2/.gitted/config
+1 −0 tests-clar/resources/testrepo2/.gitted/description
+ tests-clar/resources/testrepo2/.gitted/index
+6 −0 tests-clar/resources/testrepo2/.gitted/info/exclude
+1 −0 tests-clar/resources/testrepo2/.gitted/logs/HEAD
+1 −0 tests-clar/resources/testrepo2/.gitted/logs/refs/heads/master
+1 −0 tests-clar/resources/testrepo2/.gitted/logs/refs/remotes/origin/HEAD
+ tests-clar/resources/testrepo2/.gitted/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d
+ tests-clar/resources/testrepo2/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08
+ tests-clar/resources/testrepo2/.gitted/objects/18/1037049a54a1eb5fab404658a3a250b44335d7
+ tests-clar/resources/testrepo2/.gitted/objects/18/10dff58d8a660512d4832e740f692884338ccd
+ tests-clar/resources/testrepo2/.gitted/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2
+2 −0 tests-clar/resources/testrepo2/.gitted/objects/36/060c58702ed4c2a40832c51758d5344201d89a
+ tests-clar/resources/testrepo2/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057
+2 −0 tests-clar/resources/testrepo2/.gitted/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045
+2 −0 tests-clar/resources/testrepo2/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644
+ tests-clar/resources/testrepo2/.gitted/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96
+ tests-clar/resources/testrepo2/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a
+ tests-clar/resources/testrepo2/.gitted/objects/7f/043268ea43ce18e3540acaabf9e090c91965b0
+ tests-clar/resources/testrepo2/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d
+ tests-clar/resources/testrepo2/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479
+3 −0 tests-clar/resources/testrepo2/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a
+2 −0 tests-clar/resources/testrepo2/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f
+ tests-clar/resources/testrepo2/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd
+ tests-clar/resources/testrepo2/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6
+3 −0 tests-clar/resources/testrepo2/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644
+3 −0 tests-clar/resources/testrepo2/.gitted/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd
+ tests-clar/resources/testrepo2/.gitted/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b
+ tests-clar/resources/testrepo2/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ tests-clar/resources/testrepo2/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1
+ tests-clar/resources/testrepo2/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92
+ tests-clar/resources/testrepo2/.gitted/objects/fd/093bff70906175335656e6ce6ae05783708765
+ tests-clar/resources/testrepo2/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx
+ tests-clar/resources/testrepo2/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack
+6 −0 tests-clar/resources/testrepo2/.gitted/packed-refs
+1 −0 tests-clar/resources/testrepo2/.gitted/refs/heads/master
+1 −0 tests-clar/resources/testrepo2/.gitted/refs/remotes/origin/HEAD
+1 −0 tests-clar/resources/testrepo2/README
+1 −0 tests-clar/resources/testrepo2/new.txt
+1 −0 tests-clar/resources/testrepo2/subdir/README
+1 −0 tests-clar/resources/testrepo2/subdir/new.txt
+1 −0 tests-clar/resources/testrepo2/subdir/subdir2/README
+1 −0 tests-clar/resources/testrepo2/subdir/subdir2/new.txt

0 comments on commit 447a256

Please sign in to comment.