Add the --autostash option

yottalogical · Oct 6, 2024 · febe84c · febe84c
1 parent 5b9d30e
commit febe84c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/cli.rs b/src/cli.rs
@@ -17,6 +17,9 @@ pub struct Cli {
     #[arg(long)]
     pub onto: Option<String>,
 
+    #[arg(long)]
+    pub autostash: bool,
+
     pub upstream: Option<String>,
     pub branch: Option<String>,
 }
diff --git a/src/main.rs b/src/main.rs
@@ -13,6 +13,7 @@ fn main() -> ExitCode {
         interactive,
         dry_run,
         onto,
+        autostash,
         upstream,
         branch,
     } = Cli::parse();
@@ -24,6 +25,7 @@ fn main() -> ExitCode {
         interactive,
         dry_run,
         onto.as_deref(),
+        autostash,
     );
 
     match result {

diff --git a/src/safe_rebase.rs b/src/safe_rebase.rs
@@ -17,6 +17,7 @@ pub fn safe_rebase(
     interactive: bool,
     dry_run: bool,
     onto: Option<&str>,
+    autostash: bool,
 ) -> Result<(), ()> {
     // Get repo
     let repo = Repository::discover(repo_path.unwrap_or(&current_dir().unwrap())).unwrap();
@@ -35,7 +36,7 @@ pub fn safe_rebase(
 
                 Ok(())
             } else {
-                let result = rebase(&repo, &upstream, &branch, interactive, onto);
+                let result = rebase(&repo, &upstream, &branch, interactive, onto, autostash);
 
                 match result {
                     Ok(_) => {
@@ -219,6 +220,7 @@ fn rebase(
     branch: &Branch,
     interactive: bool,
     onto: Option<&str>,
+    autostash: bool,
 ) -> Result<ExitStatus, ExitStatus> {
     let mut args = Vec::from(["rebase"]);
 
@@ -231,6 +233,10 @@ fn rebase(
         args.push(onto);
     }
 
+    if autostash {
+        args.push("--autostash");
+    }
+
     let upstream_id = upstream.id().to_string();
     args.push(&upstream_id);
     args.push(branch.name().unwrap().unwrap());