Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Combined revert of Environment Block Changes #12140

Merged
1 commit merged into from
Jan 12, 2022
Merged

Combined revert of Environment Block Changes #12140

1 commit merged into from
Jan 12, 2022

Conversation

DHowett
Copy link
Member

@DHowett DHowett commented Jan 11, 2022

Revert "Fix environment block creation (#7401)"

This reverts commit 7886f16.

(cherry picked from commit e46ba65)

Revert "Always create a new environment block before we spawn a process (#7243)"

This reverts commit 849243a.

(cherry picked from commit 4204d25)
(cherry picked from commit f8e8572)
(cherry picked from commit cb4c4f7)
(cherry picked from commit afb0cac)
(cherry picked from commit b25dc74)
(cherry picked from commit 5f7c66b)

Fixes #7418

@DHowett
Combined revert of Environment Block Changes
3c6622c 
Revert "Fix environment block creation (#7401)"

This reverts commit 7886f16.

(cherry picked from commit e46ba65)

Revert "Always create a new environment block before we spawn a process (#7243)"

This reverts commit 849243a.

References #7418

(cherry picked from commit 4204d25)
(cherry picked from commit f8e8572)
(cherry picked from commit cb4c4f7)
(cherry picked from commit afb0cac)
(cherry picked from commit b25dc74)
(cherry picked from commit 5f7c66b)
@ghost ghost added Area-TerminalConnection Issues pertaining to the terminal<->backend connection interface Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Powershell Issues in the modern command interpreter, Powershell.exe. Product-Terminal The new Windows Terminal. labels Jan 11, 2022
@DHowett
Copy link
Member Author

DHowett commented Jan 11, 2022

FWIW perhaps reverting this is not the correct thing to do -- maybe the only part that needs to be undone is very specifically https://github.com/microsoft/terminal/pull/12140/files#diff-f0e3698039059eb99ef5a8957cd06df3534b969d496aa40210fbe669b83ca4dbL103.

@miniksa - is any of the code I'm deleting with this revert going to be useful for you in your environment work?

@zadjii-msft
Copy link
Member

FWIW I'm cool with the revert as is. If we ever need this again, we know where to find it

carlos-zamora
carlos-zamora approved these changes Jan 11, 2022
View reviewed changes
Copy link
Member

@carlos-zamora carlos-zamora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(same sentiment as what zadji said haha)

@zadjii-msft zadjii-msft added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jan 11, 2022
@ghost
Copy link

ghost commented Jan 11, 2022

Hello @zadjii-msft!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 8 hours, a condition that will be fulfilled in about 6 hours 43 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 4455bdb into main Jan 12, 2022
@ghost ghost deleted the dev/duhowett/nonvironment branch January 12, 2022 04:38
@ghost
Copy link

ghost commented Feb 3, 2022

🎉Windows Terminal Preview v1.13.10336.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost ghost mentioned this pull request Feb 3, 2022
Closed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlos-zamora carlos-zamora carlos-zamora approved these changes

@zadjii-msft zadjii-msft zadjii-msft approved these changes

Assignees
No one assigned
Labels
Area-TerminalConnection Issues pertaining to the terminal<->backend connection interface AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Powershell Issues in the modern command interpreter, Powershell.exe. Product-Terminal The new Windows Terminal.
Projects
None yet
Milestone
No milestone
3 participants
@DHowett @zadjii-msft @carlos-zamora