Rollup merge of #104865 - pratushrai0309:bootstrap, r=jyn514

matthiaskrgr · web-flow · commit 3d64420fa944 · 2022-11-30T19:53:17.000+01:00
Don't overwrite local changes when updating submodules Fixes #103485
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -647,9 +647,10 @@ 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.

Original file line number	Diff line number	Diff line change
`@@ -647,9 +647,10 @@ impl Build {`
`647`	`647`	`if !update(true).status().map_or(false, \|status\| status.success()) {`
`648`	`648`	`self.run(&mut update(false));`
`649`	`649`	`}`
`650`		`-`
	`650`	`+ self.run(Command::new("git").args(&["stash", "push"]).current_dir(&absolute_path));`
`651`	`651`	`self.run(Command::new("git").args(&["reset", "-q", "--hard"]).current_dir(&absolute_path));`
`652`		`- self.run(Command::new("git").args(&["clean", "-qdfx"]).current_dir(absolute_path));`
	`652`	`+ self.run(Command::new("git").args(&["clean", "-qdfx"]).current_dir(&absolute_path));`
	`653`	`+ self.run(Command::new("git").args(&["stash", "pop"]).current_dir(absolute_path));`
`653`	`654`	`}`
`654`	`655`
`655`	`656`	`/// If any submodule has been initialized already, sync it unconditionally.`