mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-03-10 22:21:22 -07:00
Prstep2 (#8715)
This commit is contained in:
@@ -62,22 +62,7 @@ async function main() {
|
||||
// Check if hotfix branch already exists
|
||||
if (branchExists(hotfixBranch)) {
|
||||
console.log(`Hotfix branch ${hotfixBranch} already exists.`);
|
||||
|
||||
// Check if the existing branch already has this commit
|
||||
const hasCommit = run(
|
||||
`git branch --contains ${commit} | grep ${hotfixBranch}`,
|
||||
dryRun,
|
||||
false,
|
||||
);
|
||||
if (hasCommit) {
|
||||
console.log(`Branch ${hotfixBranch} already contains commit ${commit}.`);
|
||||
return { existingBranch: hotfixBranch, hasCommit: true };
|
||||
} else {
|
||||
console.log(
|
||||
`Branch ${hotfixBranch} exists but doesn't contain commit ${commit}.`,
|
||||
);
|
||||
return { existingBranch: hotfixBranch, hasCommit: false };
|
||||
}
|
||||
return { existingBranch: hotfixBranch };
|
||||
}
|
||||
|
||||
// Create the hotfix branch from the release branch.
|
||||
|
||||
Reference in New Issue
Block a user