From db760f67908d977639fee048de9344504d0a5d86 Mon Sep 17 00:00:00 2001 From: Pratush Rai Date: Fri, 25 Nov 2022 10:52:22 +0530 Subject: [PATCH 1/3] bootstrap --- src/bootstrap/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index f4fa556b97450..108de217d7bfa 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -647,9 +647,11 @@ impl Build { if !update(true).status().map_or(false, |status| status.success()) { self.run(&mut update(false)); } - + // + self.run(Command::new("git").args(&["stash", "push"]).current_dir(&absolute_path)); self.run(Command::new("git").args(&["reset", "-q", "--hard"]).current_dir(&absolute_path)); - self.run(Command::new("git").args(&["clean", "-qdfx"]).current_dir(absolute_path)); + self.run(Command::new("git").args(&["clean", "-qdfx"]).current_dir(&absolute_path)); + self.run(Command::new("git").args(&["stash", "pop"]).current_dir(absolute_path)) } /// If any submodule has been initialized already, sync it unconditionally. From 8d148988caf8a42f38cccd88a75a02c1c4968ad4 Mon Sep 17 00:00:00 2001 From: Pratush Rai Date: Sun, 27 Nov 2022 10:05:19 +0530 Subject: [PATCH 2/3] suggested changes --- src/bootstrap/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 108de217d7bfa..5411647c065b7 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -647,11 +647,11 @@ impl Build { if !update(true).status().map_or(false, |status| status.success()) { self.run(&mut update(false)); } - // + self.run(Command::new("git").args(&["stash", "push"]).current_dir(&absolute_path)); self.run(Command::new("git").args(&["reset", "-q", "--hard"]).current_dir(&absolute_path)); self.run(Command::new("git").args(&["clean", "-qdfx"]).current_dir(&absolute_path)); - self.run(Command::new("git").args(&["stash", "pop"]).current_dir(absolute_path)) + self.run(Command::new("git").args(&["stash", "pop"]).current_dir(absolute_path)); } /// If any submodule has been initialized already, sync it unconditionally. From d74240791768624eeb4efe728a2d4ec84c2a7e65 Mon Sep 17 00:00:00 2001 From: Pratush Rai Date: Sun, 27 Nov 2022 22:23:16 +0530 Subject: [PATCH 3/3] suggested changes --- src/bootstrap/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 5411647c065b7..a3d1893afbb65 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -647,7 +647,6 @@ impl Build { if !update(true).status().map_or(false, |status| status.success()) { self.run(&mut update(false)); } - self.run(Command::new("git").args(&["stash", "push"]).current_dir(&absolute_path)); self.run(Command::new("git").args(&["reset", "-q", "--hard"]).current_dir(&absolute_path)); self.run(Command::new("git").args(&["clean", "-qdfx"]).current_dir(&absolute_path));