8000 Enable and disable GIT_OPT_ENABLE_STRICT_OBJECT_CREATION only were ne… · libgit2/objective-git@cfe733b · GitHub
[go: up one dir, main page]

Skip to content

Commit cfe733b

Browse files
committed
Enable and disable GIT_OPT_ENABLE_STRICT_OBJECT_CREATION only were necessary
1 parent c51e738 commit cfe733b

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

ObjectiveGit/GTTreeBuilder.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ - (GTTreeEntry *)addEntryWithOID:(GTOID *)oid fileName:(NSString *)fileName file
137137
NSParameterAssert(fileName != nil);
138138

139139
const git_tree_entry *entry = NULL;
140-
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0);
141140
int status = git_treebuilder_insert(&entry, self.git_treebuilder, fileName.UTF8String, oid.git_oid, (git_filemode_t)fileMode);
142141

143142
if (status != GIT_OK) {

ObjectiveGitTests/GTRepositoryCommittingSpec.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
});
2828

2929
it(@"can create commits", ^{
30+
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0);
3031
GTTreeBuilder *builder = [[GTTreeBuilder alloc] initWithTree:nil repository:repository error:NULL];
3132
expect(builder).notTo(beNil());
3233

@@ -53,6 +54,7 @@
5354
GTReference *ref = [repository headReferenceWithError:NULL];
5455
expect(ref).notTo(beNil());
5556
expect(ref.resolvedTarget).to(equal(initialCommit));
57+
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1);
5658
});
5759

5860
afterEach(^{

ObjectiveGitTests/GTTreeBuilderSpec.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@
104104
});
105105

106106
it(@"should write new blobs when the tree is written", ^{
107+
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0);
107108
GTTreeEntry *entry = [builder addEntryWithData:[@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding] fileName:@"test.txt" fileMode:GTFileModeBlob error:NULL];
109+
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1);
108110
expect(entry).notTo(beNil());
109111

110112
GTObjectDatabase *database = [repo objectDatabaseWithError:NULL];

ObjectiveGitTests/GTUtilityFunctions.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
GTBranch *branch = [GTBranch branchWithReference:head repository:repo];
2020
GTCommit *headCommit = [branch targetCommitWithError:NULL];
2121

22+
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0);
2223
GTTreeBuilder *treeBuilder = [[GTTreeBuilder alloc] initWithTree:headCommit.tree repository:repo error:nil];
2324
[treeBuilder addEntryWithData:fileData fileName:fileName fileMode:GTFileModeBlob error:nil];
25+
git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1);
2426

2527
GTTree *testTree = [treeBuilder writeTree:nil];
2628

0 commit comments

Comments
 (0)
0