mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-10-19 16:03:29 +00:00
fix(cli): correct log message for workspace fork branches
Use rawGitBranch instead of currentBranch in the log message when showing the origin of a workspace fork branch. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.5
parent
fac390a990
commit
51357f0622
@@ -497,6 +497,7 @@ export async function getEffectiveSettings(
|
||||
// Determine the branch to use: branchOverride takes precedence, then git detection
|
||||
let currentBranch: string | null = null;
|
||||
let originalBranchIfForked: string | null = null;
|
||||
let rawGitBranch: string | null = null;
|
||||
|
||||
if (branchOverride) {
|
||||
currentBranch = branchOverride;
|
||||
@@ -504,8 +505,8 @@ export async function getEffectiveSettings(
|
||||
log.info(`Using branch override: ${branchOverride}`);
|
||||
}
|
||||
} else if (isGitRepository()) {
|
||||
const branch = getCurrentGitBranch();
|
||||
originalBranchIfForked = getOriginalBranchForWorkspaceForks(branch);
|
||||
rawGitBranch = getCurrentGitBranch();
|
||||
originalBranchIfForked = getOriginalBranchForWorkspaceForks(rawGitBranch);
|
||||
|
||||
if (originalBranchIfForked) {
|
||||
log.info(
|
||||
@@ -513,7 +514,7 @@ export async function getEffectiveSettings(
|
||||
);
|
||||
currentBranch = originalBranchIfForked;
|
||||
} else {
|
||||
currentBranch = branch;
|
||||
currentBranch = rawGitBranch;
|
||||
}
|
||||
} else {
|
||||
log.debug("Not in a Git repository and no branch override provided, using top-level settings");
|
||||
@@ -552,7 +553,7 @@ export async function getEffectiveSettings(
|
||||
Object.assign(effective, gitBranches[currentBranch].overrides);
|
||||
if (!suppressLogs) {
|
||||
const extraLog = originalBranchIfForked
|
||||
? ` (because it is the origin of the workspace fork branch \`${currentBranch}\`)`
|
||||
? ` (because it is the origin of the workspace fork branch \`${rawGitBranch}\`)`
|
||||
: "";
|
||||
log.info(
|
||||
`Applied settings for Git branch: ${currentBranch}${extraLog}`
|
||||
|
||||
Reference in New Issue
Block a user