File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ export async function writeUpdates(
156
156
commitFingerprintConfig : generateCommitFingerprintConfig ( branch ) ,
157
157
managers,
158
158
} ) ;
159
- branch . cacheFingerPrintMatch = compareCacheFingerprint (
159
+ branch . cacheFingerprintMatch = compareCacheFingerprint (
160
160
branchState ,
161
161
commitFingerprint ,
162
162
) ;
Original file line number Diff line number Diff line change @@ -1226,7 +1226,7 @@ describe('workers/repository/update/branch/index', () => {
1226
1226
await branchWorker . processBranch ( {
1227
1227
...config ,
1228
1228
baseBranch : 'new_base' ,
1229
- skipBranchUpdate : true ,
1229
+ cacheFingerprintMatch : 'matched' ,
1230
1230
} ) ;
1231
1231
expect ( logger . debug ) . toHaveBeenCalledWith (
1232
1232
'Base branch changed by user, rebasing the branch onto new base' ,
@@ -1480,7 +1480,7 @@ describe('workers/repository/update/branch/index', () => {
1480
1480
branchPrefixOld : 'old/' ,
1481
1481
commitFingerprint : '111' ,
1482
1482
reuseExistingBranch : true ,
1483
- skipBranchUpdate : true ,
1483
+ cacheFingerprintMatch : 'matched' ,
1484
1484
} ;
1485
1485
expect ( await branchWorker . processBranch ( inconfig ) ) . toEqual ( {
1486
1486
branchExists : true ,
@@ -2500,7 +2500,7 @@ describe('workers/repository/update/branch/index', () => {
2500
2500
} ) ,
2501
2501
) ;
2502
2502
config . reuseExistingBranch = true ;
2503
- config . skipBranchUpdate = true ;
2503
+ config . cacheFingerprintMatch = 'matched' ;
2504
2504
const inconfig = {
2505
2505
...config ,
2506
2506
branchName : 'new/some-branch' ,
Original file line number Diff line number Diff line change @@ -475,7 +475,7 @@ export async function processBranch(
475
475
'Base branch changed by user, rebasing the branch onto new base' ,
476
476
) ;
477
477
config . reuseExistingBranch = false ;
478
- } else if ( config . cacheFingerPrintMatch === 'no-match' ) {
478
+ } else if ( config . cacheFingerprintMatch === 'no-match' ) {
479
479
logger . debug (
480
480
'Cache fingerprint does not match, cannot reuse existing branch' ,
481
481
) ;
@@ -487,7 +487,7 @@ export async function processBranch(
487
487
logger . debug ( `Using reuseExistingBranch: ${ config . reuseExistingBranch ! } ` ) ;
488
488
if (
489
489
! (
490
- config . reuseExistingBranch && config . cacheFingerPrintMatch === 'matched'
490
+ config . reuseExistingBranch && config . cacheFingerprintMatch === 'matched'
491
491
)
492
492
) {
493
493
await scm . checkoutBranch ( config . baseBranch ) ;
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ export interface BranchConfig
134
134
stopUpdating ?: boolean ;
135
135
isConflicted ?: boolean ;
136
136
commitFingerprint ?: string ;
137
- cacheFingerPrintMatch ?: 'no-fingerprint' | 'no-match' | 'matched' ;
137
+ cacheFingerprintMatch ?: 'no-fingerprint' | 'no-match' | 'matched' ;
138
138
}
139
139
140
140
export interface BranchMetadata {
You can’t perform that action at this time.
0 commit comments