Skip to content

Commit 35f7d08

Browse files
committed
Fix pull spec mess and include in both targets
1 parent 81901e7 commit 35f7d08

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
2089E43C17D9A58000F451DA /* GTTagSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 2089E43B17D9A58000F451DA /* GTTagSpec.m */; };
6161
20F43DE318A2F668007D3621 /* GTRepository+Blame.h in Headers */ = {isa = PBXBuildFile; fileRef = 20F43DE118A2F667007D3621 /* GTRepository+Blame.h */; settings = {ATTRIBUTES = (Public, ); }; };
6262
20F43DE618A2F668007D3621 /* GTRepository+Blame.m in Sources */ = {isa = PBXBuildFile; fileRef = 20F43DE218A2F667007D3621 /* GTRepository+Blame.m */; };
63+
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
64+
23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
6365
3011D86B1668E48500CE3409 /* GTDiffFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D8691668E48500CE3409 /* GTDiffFile.h */; settings = {ATTRIBUTES = (Public, ); }; };
6466
3011D86D1668E48500CE3409 /* GTDiffFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3011D86A1668E48500CE3409 /* GTDiffFile.m */; };
6567
3011D8711668E78500CE3409 /* GTDiffHunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 3011D86F1668E78500CE3409 /* GTDiffHunk.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -363,7 +365,6 @@
363365
F8D1BDF01B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
364366
F8D1BDF11B31FE7C00CDEC90 /* GTRepository+Pull.m in Sources */ = {isa = PBXBuildFile; fileRef = F8D1BDED1B31FE7C00CDEC90 /* GTRepository+Pull.m */; };
365367
F8E4A2911A170CA6006485A8 /* GTRemotePushSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E4A2901A170CA6006485A8 /* GTRemotePushSpec.m */; };
366-
F8EFA0371B405020000FF7D0 /* GTRepository+PullSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0361B405020000FF7D0 /* GTRepository+PullSpec.m */; };
367368
F8EFA03A1B4059ED000FF7D0 /* GTUtilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EFA0391B4059ED000FF7D0 /* GTUtilityFunctions.m */; };
368369
/* End PBXBuildFile section */
369370

@@ -1387,6 +1388,7 @@
13871388
isa = PBXSourcesBuildPhase;
13881389
buildActionMask = 2147483647;
13891390
files = (
1391+
23BB67C11C7DF60300A37A66 /* GTRepository+PullSpec.m in Sources */,
13901392
D0751CD918BE520400134314 /* GTFilterListSpec.m in Sources */,
13911393
200578C518932A82001C06C3 /* GTBlameSpec.m in Sources */,
13921394
4D1C40D8182C006D00BE2960 /* GTBlobSpec.m in Sources */,
@@ -1408,7 +1410,6 @@
14081410
D0AC906C172F941F00347DC4 /* GTRepositorySpec.m in Sources */,
14091411
D01EFDA0195DEF2200838D24 /* NSDataGitSpec.m in Sources */,
14101412
30A269AD17B4878C000FE64E /* GTRepository+StatusSpec.m in Sources */,
1411-
F8EFA0371B405020000FF7D0 /* GTRepository+PullSpec.m in Sources */,
14121413
307623AB17C6C8BD00E2CDF1 /* NSArray+StringArraySpec.m in Sources */,
14131414
8832811F173D8816006D7DCF /* GTIndexSpec.m in Sources */,
14141415
D0F4E28A17C7F24200BBDE30 /* NSErrorGitSpec.m in Sources */,
@@ -1555,6 +1556,7 @@
15551556
F8D007761B4F7D10009A8DAF /* GTTimeAdditionsSpec.m in Sources */,
15561557
F8D007921B4FA03B009A8DAF /* GTIndexSpec.m in Sources */,
15571558
F8D007711B4F7CB0009A8DAF /* NSDataGitSpec.m in Sources */,
1559+
23BB67C21C7DF60400A37A66 /* GTRepository+PullSpec.m in Sources */,
15581560
F8D007A11B4FA03B009A8DAF /* GTRepositoryStashingSpec.m in Sources */,
15591561
F8D007A31B4FA03B009A8DAF /* GTFilterListSpec.m in Sources */,
15601562
F8D0079D1B4FA03B009A8DAF /* GTTreeBuilderSpec.m in Sources */,

ObjectiveGitTests/GTRepository+PullSpec.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
[NSFileManager.defaultManager removeItemAtURL:remoteRepoURL error:NULL];
6969
[NSFileManager.defaultManager removeItemAtURL:localRepoURL error:NULL];
7070
error = NULL;
71-
[self tearDown];
7271
});
7372

7473
context(@"when the local and remote branches are in sync", ^{

0 commit comments

Comments
 (0)