From fc75f723f681dc2cb1b0be7395c936adfb2f6f63 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 3 Aug 2023 12:14:58 +0200
Subject: [PATCH] also use 'env' for printing unsetting

---
 library/std/src/process/tests.rs                   |  2 +-
 library/std/src/sys/unix/process/process_common.rs | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/library/std/src/process/tests.rs b/library/std/src/process/tests.rs
index b50dea2e737..72894142d17 100644
--- a/library/std/src/process/tests.rs
+++ b/library/std/src/process/tests.rs
@@ -544,7 +544,7 @@ fn debug_print() {
 
     let mut command_with_removed_env = Command::new("boring-name");
     command_with_removed_env.env_remove("FOO").env_remove("BAR");
-    assert_eq!(format!("{command_with_removed_env:?}"), r#"unset BAR FOO && "boring-name""#);
+    assert_eq!(format!("{command_with_removed_env:?}"), r#"env -u BAR -u FOO "boring-name""#);
     assert_eq!(
         format!("{command_with_removed_env:#?}"),
         format!(
diff --git a/library/std/src/sys/unix/process/process_common.rs b/library/std/src/sys/unix/process/process_common.rs
index 23d9f3b78ee..957947a674a 100644
--- a/library/std/src/sys/unix/process/process_common.rs
+++ b/library/std/src/sys/unix/process/process_common.rs
@@ -562,21 +562,17 @@ impl fmt::Debug for Command {
                 write!(f, "env -i ")?;
                 // Altered env vars will be printed next, that should exactly work as expected.
             } else {
-                // Removed env vars need a separate command.
-                // We use a single `unset` command for all of them.
+                // Removed env vars need the command to be wrappen in `env`.
                 let mut any_removed = false;
                 for (key, value_opt) in self.get_envs() {
                     if value_opt.is_none() {
                         if !any_removed {
-                            write!(f, "unset ")?;
+                            write!(f, "env ")?;
                             any_removed = true;
                         }
-                        write!(f, "{} ", key.to_string_lossy())?;
+                        write!(f, "-u {} ", key.to_string_lossy())?;
                     }
                 }
-                if any_removed {
-                    write!(f, "&& ")?;
-                }
             }
             // Altered env vars can just be added in front of the program.
             for (key, value_opt) in self.get_envs() {