gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't fail on deleting non existent branch

Browse Source
This commit is contained in:
erezrokah 2019-12-13 17:02:57 +02:00
parent 10a735de2f
commit 1e77d4b768
No known key found for this signature in database
GPG Key ID: B51CA2E23622ABB2
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/netlify-cms-backend-github/src/API.js
View File

@ -932,22 +932,10 @@ export default class API {
async deleteUnpublishedEntry(collectionName, slug) { async deleteUnpublishedEntry(collectionName, slug) {
const contentKey = this.generateContentKey(collectionName, slug); const contentKey = this.generateContentKey(collectionName, slug);
const branchName = this.generateBranchName(contentKey); const branchName = this.generateBranchName(contentKey);
return ( return this.retrieveMetadata(contentKey)
this.retrieveMetadata(contentKey) .then(metadata => (metadata && metadata.pr ? this.closePR(metadata.pr) : Promise.resolve()))
.then(metadata => (metadata && metadata.pr ? this.closePR(metadata.pr) : Promise.resolve())) .then(() => this.deleteBranch(branchName))
.then(() => this.deleteBranch(branchName)) .then(() => this.deleteMetadata(contentKey));
.then(() => this.deleteMetadata(contentKey))
// If the PR doesn't exist, then this has already been deleted -
// deletion should be idempotent, so we can consider this a
// success.
.catch(err => {
if (err.message === 'Reference does not exist') {
return Promise.resolve();
}
console.error(err);
return Promise.reject(err);
})
);
} }
async publishUnpublishedEntry(collectionName, slug) { async publishUnpublishedEntry(collectionName, slug) {
@ -1003,7 +991,16 @@ export default class API {
} }
deleteBranch(branchName) { deleteBranch(branchName) {
return this.deleteRef('heads', branchName); return this.deleteRef('heads', branchName).catch(err => {
// If the branch doesn't exist, then it has already been deleted -
// deletion should be idempotent, so we can consider this a
// success.
if (err.message === 'Reference does not exist') {
return Promise.resolve();
}
console.error(err);
return Promise.reject(err);
});
} }
async createPR(title, head) { async createPR(title, head) {