starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-04 05:35:20 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #12906] [MERGED] Fix profile commandlines being overwritten by profile.defaults #29290

New Issue
Open
opened 2026-01-31 09:34:02 +00:00 by claunia · 0 comments
claunia commented 2026-01-31 09:34:02 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/12906
Author: @lhecker
Created: 4/14/2022
Status: ✅ Merged
Merged: 4/18/2022
Merged by: @undefined

Base: main ← Head: dev/lhecker/12842-path-fixup

📝 Commits (2)

  • 5f0c83e Fix profile commandlines being overwritten by profile.defaults
  • 57d4e88 Address feedback

📊 Changes

4 files changed (+89 additions, -43 deletions)

View changed files

📝 src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp (+33 -22)
📝 src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp (+0 -1)
📝 src/cascadia/TerminalSettingsModel/CascadiaSettings.h (+1 -1)
📝 src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp (+55 -19)

📄 Description

#12149 introduced a bug where ClearCommandline() is called on any user
profile containing the non-canonical strings "cmd.exe" or "powershell.exe"
in the "commandline" field. If you happen to have set the "commandline"
field in your profiles.defaults, this will cause these user profiles
to adopt the base layer command-line instead of the defaults layer one.

This commit fixes the issue, by checking the command-line after the call
to ClearCommandline() and ensuring it's the expected string.

Additionally this moves the migration logic to SettingsLoader as this allows
us to write the fixed settings to disk, if any fixed had to be applied.

PR Checklist

Validation Steps Performed

  • The modified unit test fails without these changes ✅
  • The modified unit test succeeds with these changes ✅
  • Setting profiles.defaults.commandline to "pwsh.exe" and setting
    my "...\powershell.exe" profile to use just "powershell.exe" as
    the commandline, doesn't cause it to use "pwsh.exe" ✅
    The fixed settings are written to settings.json ✅

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/12906 **Author:** [@lhecker](https://github.com/lhecker) **Created:** 4/14/2022 **Status:** ✅ Merged **Merged:** 4/18/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/lhecker/12842-path-fixup` --- ### 📝 Commits (2) - [`5f0c83e`](https://github.com/microsoft/terminal/commit/5f0c83ebf7d24f7de6ca4d3f63a1db40ed127c2e) Fix profile commandlines being overwritten by profile.defaults - [`57d4e88`](https://github.com/microsoft/terminal/commit/57d4e881640c98a3846e7e96347b7dd4624d5f1f) Address feedback ### 📊 Changes **4 files changed** (+89 additions, -43 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp` (+33 -22) 📝 `src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp` (+0 -1) 📝 `src/cascadia/TerminalSettingsModel/CascadiaSettings.h` (+1 -1) 📝 `src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp` (+55 -19) </details> ### 📄 Description #12149 introduced a bug where `ClearCommandline()` is called on any user profile containing the non-canonical strings "cmd.exe" or "powershell.exe" in the "commandline" field. If you happen to have set the "commandline" field in your `profiles.defaults`, this will cause these user profiles to adopt the base layer command-line instead of the defaults layer one. This commit fixes the issue, by checking the command-line after the call to `ClearCommandline()` and ensuring it's the expected string. Additionally this moves the migration logic to `SettingsLoader` as this allows us to write the fixed settings to disk, if any fixed had to be applied. ## PR Checklist * [x] Closes #12842 * [x] I work here * [x] Tests added/passed ## Validation Steps Performed * The modified unit test fails without these changes ✅ * The modified unit test succeeds with these changes ✅ * Setting `profiles.defaults.commandline` to "pwsh.exe" and setting my "...\\powershell.exe" profile to use just "powershell.exe" as the `commandline`, doesn't cause it to use "pwsh.exe" ✅ The fixed settings are written to settings.json ✅ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:34:02 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
⛺ Reserved
A11yCO
A11yMAS
A11ySev1
A11ySev2
A11ySev3
A11yTTValidated
A11yUsable
A11yVoiceAccess
A11yWCAG
Area-Accessibility
Area-AtlasEngine
Area-AzureShell
Area-Build
Area-Build
Area-Chat
Area-CmdPal
Area-CodeHealth
Area-Commandline
Area-CookedRead
Area-DefApp
Area-Extensibility
Area-Fonts
Area-GroupPolicy
Area-i18n
Area-Input
Area-Interaction
Area-Interop
Area-Localization
Area-Output
Area-Performance
Area-Portable
Area-Quality
Area-Remoting
Area-Rendering
Area-Schema
Area-Server
Area-Settings
Area-SettingsUI
Area-ShellExtension
Area-ShellExtension
Area-ShellExtension
Area-Suggestions
Area-Suggestions
Area-TerminalConnection
Area-TerminalControl
Area-Theming
Area-UserInterface
Area-VT
Area-Windowing
Area-WPFControl
AutoMerge
Blocking-Ingestion
Culprit-Centennial
Culprit-WinUI
Disability-All
Disability-Blind
Disability-LowVision
Disability-Mobility
External-Blocked-WinUI3
Fixed
Gathering-Data
good first issue
HCL-E+D
HCL-WindowsTerminal
Help Wanted
Impact-Compatibility
Impact-Compliance
Impact-Correctness
Impact-Visual
In-PR
InclusionBacklog
InclusionBacklog-Windows TerminalWin32
InclusionCommitted-202206
Issue-Bug
Issue-Docs
Issue-Feature
Issue-Feature
Issue-Question
Issue-Samples
Issue-Scenario
Issue-Task
Needs-Attention
Needs-Author-Feedback
Needs-Bisect
Needs-Discussion
Needs-Repro
Needs-Tag-Fix
Needs-Tag-Fix
Needs-Triage
No-Recent-Activity
Priority-0
Priority-1
Priority-2
Priority-3
Product-Cmd.exe
Product-Colortool
Product-Colortool
Product-Colortool
Product-Conhost
Product-Conpty
Product-Meta
Product-Powershell
Product-Terminal
Product-WSL
pull-request
Mirrored from GitHub Pull Request
 Resolution-Answered
Resolution-By-Design
Resolution-Duplicate
Resolution-External
Resolution-Fix-Available
Resolution-Fix-Committed
Resolution-No-Repro
Resolution-Won't-Fix
Severity-Blocking
Severity-Crash
Severity-DataLoss
spam
this-will-be-a-breaking-change
Tracking-External
WindowsTerminal_Win32
Work-Item
zAskModeBug
zInbox-Bug
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#29290
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?