@@ -131,7 +131,9 @@ - (NSString *) blame:(NSError **)anError
131
131
if (error==nil ){
132
132
res=[repository outputInWorkdirForArguments: [NSArray arrayWithObjects: @" blame" , @" -p" , sha, @" --" , [self fullPath ], nil ]];
133
133
}else {
134
- *anError = [NSError errorWithDomain: @" blame" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
134
+ if (anError != NULL ) {
135
+ *anError = [NSError errorWithDomain: @" blame" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
136
+ }
135
137
}
136
138
137
139
return res;
@@ -147,7 +149,9 @@ - (NSString *) log:(NSString *)format error:(NSError **)anError
147
149
if (error==nil ){
148
150
res=[repository outputInWorkdirForArguments: [NSArray arrayWithObjects: @" log" , [NSString stringWithFormat: @" --pretty=format:%@ " ,format], @" --" , [self fullPath ], nil ]];
149
151
}else {
150
- *anError = [NSError errorWithDomain: @" log" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
152
+ if (anError != NULL ) {
153
+ *anError = [NSError errorWithDomain: @" log" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
154
+ }
151
155
}
152
156
153
157
return res;
@@ -178,12 +182,16 @@ - (NSString *) diff:(NSString *)format error:(NSError **)anError
178
182
res=[repository outputInWorkdirForArguments: [NSArray arrayWithObjects: @" diff" , sha, des,[self fullPath ], nil ]];
179
183
if ([res length ]==0 ) {
180
184
NSLog (@" --%d " ,[res length ]);
181
- *anError = [NSError errorWithDomain: @" diff" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: @" No Diff" ,NSLocalizedDescriptionKey ,nil ]];
185
+ if (anError != NULL ) {
186
+ *anError = [NSError errorWithDomain: @" diff" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: @" No Diff" ,NSLocalizedDescriptionKey ,nil ]];
187
+ }
182
188
}else {
183
189
NSLog (@" --%@ " ,[res substringToIndex: 80 ]);
184
190
}
185
191
}else {
186
- *anError = [NSError errorWithDomain: @" diff" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
192
+ if (anError != NULL ) {
193
+ *anError = [NSError errorWithDomain: @" diff" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
194
+ }
187
195
}
188
196
189
197
return res;
@@ -205,7 +213,9 @@ - (NSString *)textContents:(NSError **)anError
205
213
if (error==nil ){
206
214
res = [self contents ];
207
215
}else {
208
- *anError = [NSError errorWithDomain: @" show" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
216
+ if (anError != NULL ) {
217
+ *anError = [NSError errorWithDomain: @" show" code: 1 userInfo: [NSDictionary dictionaryWithObjectsAndKeys: error,NSLocalizedDescriptionKey ,nil ]];
218
+ }
209
219
}
210
220
211
221
return res;
0 commit comments