Make the error nicer if the working directory is not clean

Author: Kobzol

src/sync.rs

@@ -65,7 +65,7 @@ impl GitSync {
                 .to_owned()
         };
 
-        ensure_clean_git_state(self.verbose);
+        ensure_clean_git_state(self.verbose)?;
 
         // Make sure josh is running.
         let josh = self
@@ -248,7 +248,7 @@ After you fix the conflicts, `git add` the changes and run `git merge --continue
     }
 
     pub fn rustc_push(&self, username: &str, branch: &str) -> anyhow::Result<()> {
-        ensure_clean_git_state(self.verbose);
+        ensure_clean_git_state(self.verbose)?;
 
         let base_upstream_sha = self.context.last_upstream_sha.clone().unwrap_or_default();
 

src/utils.rs

@@ -69,13 +69,17 @@ fn run_command_inner<'a, Args: AsRef<[&'a str]>>(
 }
 
 /// Fail if there are files that need to be checked in.
-pub fn ensure_clean_git_state(verbose: bool) {
+pub fn ensure_clean_git_state(verbose: bool) -> anyhow::Result<()> {
     let read = run_command(
         ["git", "status", "--untracked-files=no", "--porcelain"],
         verbose,
     )
     .expect("cannot figure out if git state is clean");
-    assert!(read.is_empty(), "working directory must be clean");
+    if !read.is_empty() {
+        Err(anyhow::anyhow!("working directory must be clean"))
+    } else {
+        Ok(())
+    }
 }
 
 pub fn get_current_head_sha(verbose: bool) -> anyhow::Result<String> {