[PR #3031] [MERGED] Layer the globals globals on top of the root globals #25208

Open
opened 2026-01-31 09:07:59 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/3031
Author: @zadjii-msft
Created: 10/2/2019
Status: Merged
Merged: 10/4/2019
Merged by: @zadjii-msft

Base: masterHead: dev/migrie/b/2906-globalization


📝 Commits (2)

  • 7cf5b67 Layer the globals globals on top of the root globals
  • 9934049 add more test cases for @carlos-zamora

📊 Changes

2 files changed (+117 additions, -7 deletions)

View changed files

📝 src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp (+112 -0)
📝 src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp (+5 -7)

📄 Description

Summary of the Pull Request

Layer the globals globals on top of the root globals.

PR Checklist

Detailed Description of the Pull Request / Additional comments

We added the ability for the root to be used as the globals object in #2515. However, if you have a globals object, then the settings in the root will get ignored. That's bad. We should layer them.


🔄 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/3031 **Author:** [@zadjii-msft](https://github.com/zadjii-msft) **Created:** 10/2/2019 **Status:** ✅ Merged **Merged:** 10/4/2019 **Merged by:** [@zadjii-msft](https://github.com/zadjii-msft) **Base:** `master` ← **Head:** `dev/migrie/b/2906-globalization` --- ### 📝 Commits (2) - [`7cf5b67`](https://github.com/microsoft/terminal/commit/7cf5b67c286fb713d5b85189a5c1811669ea8e83) Layer the globals globals on top of the root globals - [`9934049`](https://github.com/microsoft/terminal/commit/993404913690c7d59de3ad309a098fc90c80e57e) add more test cases for @carlos-zamora ### 📊 Changes **2 files changed** (+117 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp` (+112 -0) 📝 `src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp` (+5 -7) </details> ### 📄 Description ## Summary of the Pull Request Layer the `globals` globals on top of the root globals. ## PR Checklist * [x] Closes #2906 * [x] I work here * [x] Tests added/passed * [n/a] Requires documentation to be updated ## Detailed Description of the Pull Request / Additional comments We added the ability for the root to be used as the globals object in #2515. However, if you have a globals object, then the settings in the root will get ignored. That's bad. We should layer them. --- <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:07:59 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#25208