File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change 10
10
11
11
#import " GTCommit.h"
12
12
#import " GTRemote.h"
13
- #import " GTSignature .h"
13
+ #import " GTReference .h"
14
14
#import " GTRepository+Committing.h"
15
15
#import " GTRepository+RemoteOperations.h"
16
16
@@ -73,11 +73,10 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
73
73
} else if (analysis & GTMergeAnalysisFastForward ||
74
74
analysis & GTMergeAnalysisUnborn) {
75
75
// Do FastForward
76
- [localBranch.reference referenceByUpdatingTarget: remoteCommit.SHA committer: [self userSignatureForNow ] message: [NSString stringWithFormat: @" Merge branch '%@ '" , localBranch.shortName] error: error];
76
+ [localBranch.reference referenceByUpdatingTarget: remoteCommit.SHA message: nil error: error];
77
+ BOOL checkoutSuccess = [self checkoutReference: localBranch.reference strategy: GTCheckoutStrategyForce error: error progressBlock: nil ];
77
78
78
- BOOL success = [self checkoutReference: localBranch.reference strategy: GTCheckoutStrategyForce error: error progressBlock: nil ];
79
-
80
- return success;
79
+ return checkoutSuccess;
81
80
} else if (analysis & GTMergeAnalysisNormal) {
82
81
// Do normal merge
83
82
GTTree *remoteTree = remoteCommit.tree ;
You can’t perform that action at this time.
0 commit comments