Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
693963d9
Commit
693963d9
authored
3 years ago
by
Rhys Arkins
Browse files
Options
Downloads
Patches
Plain Diff
fix: catch prune branch error
parent
01acebd8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/workers/repository/finalise/prune.ts
+5
-1
5 additions, 1 deletion
lib/workers/repository/finalise/prune.ts
with
5 additions
and
1 deletion
lib/workers/repository/finalise/prune.ts
+
5
−
1
View file @
693963d9
...
...
@@ -69,7 +69,11 @@ async function cleanUpBranches(
await
deleteBranch
(
branchName
);
}
}
catch
(
err
)
/* istanbul ignore next */
{
if
(
err
.
message
?.
includes
(
"
bad revision 'origin/
"
))
{
if
(
err
.
message
===
'
config-validation
'
)
{
logger
.
debug
(
'
Cannot prune branch due to collision between tags and branch names
'
);
}
else
if
(
err
.
message
?.
includes
(
"
bad revision 'origin/
"
))
{
logger
.
debug
(
{
branchName
},
'
Branch not found on origin when attempting to prune
'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment