microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-04-12 23:36:28 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update cherry-pick pr script to use mergebase (#32031)

Browse Source
This commit is contained in:
Wesley Wigham
2019-06-21 14:34:26 -07:00
committed by GitHub
parent 1cbace6eee
commit 5498f583f9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/open-cherry-pick-pr.ts
View File

@@ -36,9 +36,10 @@ async function main() {
Component commits:
${logText.trim()}`
const logpath = path.join(__dirname, "../", "logmessage.txt");
const mergebase = runSequence([["git", ["merge-base", "origin/master", currentSha]]]).trim();
runSequence([
["git", ["checkout", "-b", "temp-branch"]],
["git", ["reset", "origin/master", "--soft"]]
["git", ["reset", mergebase, "--soft"]]
]);
fs.writeFileSync(logpath, logText);
runSequence([