wait_for_newline=true in git add confirmation (#7)

Author: guswynn

Cargo.lock

@@ -8,7 +8,7 @@ edition = "2018"
 anyhow = "1.0"
 clap = { version = "2.33", features = ["wrap_help"] }
 console = "0.11"
-dialoguer = "0.6.0"
+dialoguer = "0.9.0"
 git2 = { version = "0.13.0", default_features = false }
 structopt = "0.3"
 

Cargo.toml

@@ -17,9 +17,10 @@ pub fn instafix(
     max_commits: usize,
     message_pattern: Option<String>,
     upstream_branch_name: Option<&str>,
+    require_newline: bool,
 ) -> Result<(), anyhow::Error> {
     let repo = Repository::open(".")?;
-    let diff = create_diff(&repo)?;
+    let diff = create_diff(&repo, require_newline)?;
     let head = repo.head().context("finding head commit")?;
     let head_branch = Branch::wrap(head);
     let upstream = get_upstream(&repo, &head_branch, upstream_branch_name)?;
@@ -218,7 +219,7 @@ fn get_upstream<'a>(
 }
 
 /// Get a diff either from the index or the diff from the index to the working tree
-fn create_diff(repo: &Repository) -> Result<Diff, anyhow::Error> {
+fn create_diff(repo: &Repository, require_newline: bool) -> Result<Diff, anyhow::Error> {
     let head = repo.head()?;
     let head_tree = head.peel_to_tree()?;
     let staged_diff = repo.diff_tree_to_index(Some(&head_tree), None, None)?;
@@ -230,6 +231,7 @@ fn create_diff(repo: &Repository) -> Result<Diff, anyhow::Error> {
             print_diff(Changes::Unstaged)?;
             if !Confirm::new()
                 .with_prompt("Nothing staged, stage and commit everything?")
+                .wait_for_newline(require_newline)
                 .interact()?
             {
                 bail!("");

src/lib.rs

@@ -17,6 +17,7 @@ use std::env;
 use structopt::StructOpt;
 
 const UPSTREAM_VAR: &str = "GIT_INSTAFIX_UPSTREAM";
+const REQUIRE_NEWLINE: &str = "GIT_INSTAFIX_REQUIRE_NEWLINE";
 
 #[derive(StructOpt, Debug)]
 #[structopt(
@@ -51,6 +52,10 @@ struct Args {
 
     #[structopt(long, env(UPSTREAM_VAR))]
     default_upstream_branch: Option<String>,
+
+    /// Require a newline when confirming y/n questions
+    #[structopt(long, env(REQUIRE_NEWLINE))]
+    require_newline: bool,
 }
 
 fn main() {
@@ -63,6 +68,7 @@ fn main() {
         args.max_commits,
         args.commit_message_pattern,
         args.default_upstream_branch.as_deref(),
+        args.require_newline,
     ) {
         // An empty message means don't display any error message
         let msg = e.to_string();