fix: Actually use squash mode when asked to. (#19)

Author: quodlibetor

src/lib.rs

@@ -13,7 +13,7 @@ enum Changes {
 }
 
 pub fn instafix(
-    _squash: bool,
+    squash: bool,
     max_commits: usize,
     message_pattern: Option<String>,
     upstream_branch_name: Option<&str>,
@@ -26,7 +26,7 @@ pub fn instafix(
     let upstream = get_upstream(&repo, &head_branch, upstream_branch_name)?;
     let commit_to_amend = select_commit_to_amend(&repo, upstream, max_commits, &message_pattern)?;
     eprintln!("Selected {}", disp(&commit_to_amend));
-    do_fixup_commit(&repo, &head_branch, &commit_to_amend, false)?;
+    do_fixup_commit(&repo, &head_branch, &commit_to_amend, squash)?;
     let current_branch = Branch::wrap(repo.head()?);
     do_rebase(&repo, &current_branch, &commit_to_amend, &diff)?;
 

src/main.rs

@@ -38,7 +38,7 @@ When run with no arguments this will:
     max_term_width = 100
 )]
 struct Args {
-    /// Use `squash!`: change the commit message that you amend
+    /// Change the commit message that you amend, instead of using the original commit message
     #[clap(short = 's', long = "squash")]
     squash: bool,
     /// The maximum number of commits to show when looking for your merge point
@@ -59,6 +59,7 @@ struct Args {
 
 fn main() {
     let mut args = Args::parse();
+    // if called as git squash set the squash flag to true
     if env::args().next().unwrap().ends_with("squash") {
         args.squash = true
     }