hanyixuanten/vscode-cpptools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move cleanup to after last async call. Call git fetch to ensure master ref is present (#4316)

Browse Source 
Directly submitting, as this does not build.
This commit is contained in:
Colen Garoutte-Carson
2019-09-23 18:40:42 -07:00
committed by GitHub
parent b520073176
commit 46c9e53676
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extension/translations_auto_pr.js
+13 -10
View File
@@ -92,6 +92,9 @@ if (!hasAnyChanges()) {
console.log("Changes detected");
console.log(`Ensure master ref is up to date locally (git fetch)`);
cp.execSync('git fetch');
// Remove old localization branch, if any
if (hasBranch("localization")) {
console.log(`Remove old localization branch, if any (git branch -D localization)`);
@@ -143,14 +146,14 @@ octokit.pulls.list({ owner: repoOwner, repo: repoName }).then(({data}) => {
} else {
console.log("There is already a pull request.");
}
console.log(`Restoring default git permissions`);
cp.execSync('git remote remove origin');
cp.execSync(`git remote add origin https://github.com/${repoOwner}/${repoName}.git`);
console.log(`Switching back to master (git checkout master)`);
cp.execSync('git checkout master');
console.log(`Remove localization branch (git branch -D localization)`);
cp.execSync('git branch -D localization');
});
console.log(`Restoring default git permissions`);
cp.execSync('git remote remove origin');
cp.execSync(`git remote add origin https://github.com/${repoOwner}/${repoName}.git`);
console.log(`Switching back to master (git checkout master)`);
cp.execSync('git checkout master');
console.log(`Remove localization branch (git branch -D localization)`);
cp.execSync('git branch -D localization');