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

fix(backend-github): don't create new commits on empty diff when rebasing (#3411)

Browse Source
This commit is contained in:
Erez Rokah 2020-03-12 14:28:50 +01:00 committed by GitHub
parent c2e7a24dc2
commit 70de9f6b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/netlify-cms-backend-github/src/API.ts
View File

@ -989,18 +989,24 @@ export default class API {
const result = await this.getDifferences(commit.parents[0].sha, commit.sha); const result = await this.getDifferences(commit.parents[0].sha, commit.sha);
const files = getTreeFiles(result.files as GitHubCompareFiles); const files = getTreeFiles(result.files as GitHubCompareFiles);
// create a tree with baseCommit as the base with the diff applied // only update the tree if changes were detected
const tree = await this.updateTree(baseCommit.sha, files); if (files.length > 0) {
const { message, author, committer } = commit.commit; // create a tree with baseCommit as the base with the diff applied
const tree = await this.updateTree(baseCommit.sha, files);
const { message, author, committer } = commit.commit;
// create a new commit from the updated tree // create a new commit from the updated tree
return (this.createCommit( const newCommit = await this.createCommit(
message, message,
tree.sha, tree.sha,
[baseCommit.sha], [baseCommit.sha],
author, author,
committer, committer,
) as unknown) as GitHubCompareCommit; );
return (newCommit as unknown) as GitHubCompareCommit;
} else {
return commit;
}
} }
/** /**