Update cherry-pick pr script to use mergebase (#32031)
This commit is contained in:
parent
1cbace6eee
commit
5498f583f9
|
@ -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([
|
||||
|
|
Loading…
Reference in a new issue