Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(util/git): pass no-verify flag to deleteBranch #29749

Merged
merged 1 commit into from
Jun 18, 2024
Merged

fix(util/git): pass no-verify flag to deleteBranch #29749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions lib/util/git/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,30 @@ describe('util/git/index', () => {
const branches = await Git(origin.path).branch({});
expect(branches.all).not.toContain('renovate/past_branch');
});

it('should add no verify flag', async () => {
const rawSpy = jest.spyOn(SimpleGit.prototype, 'raw');
await git.deleteBranch('renovate/something');
expect(rawSpy).toHaveBeenCalledWith([
'push',
'--delete',
'origin',
'renovate/something',
]);
});

it('should not add no verify flag', async () => {
const rawSpy = jest.spyOn(SimpleGit.prototype, 'raw');
setNoVerify(['push']);
await git.deleteBranch('renovate/something');
expect(rawSpy).toHaveBeenCalledWith([
'push',
'--delete',
'origin',
'renovate/something',
'--no-verify',
]);
});
});

describe('getBranchLastCommitTime', () => {
Expand Down
8 changes: 7 additions & 1 deletion lib/util/git/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,13 @@ export async function isBranchConflicted(
export async function deleteBranch(branchName: string): Promise<void> {
await syncGit();
try {
await gitRetry(() => git.raw(['push', '--delete', 'origin', branchName]));
const deleteCommand = ['push', '--delete', 'origin', branchName];

if (getNoVerify().includes('push')) {
deleteCommand.push('--no-verify');
}

await gitRetry(() => git.raw(deleteCommand));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonder why we use raw instead of push method 🤔

logger.debug(`Deleted remote branch: ${branchName}`);
} catch (err) /* istanbul ignore next */ {
const errChecked = checkForPlatformFailure(err);
Expand Down