Remove force attribute from Config

Avoids the possibility of misusing the flag in
lib and below, but now the unit tests do not test
the use of the --force flag.

Author: blairconrad

src/config.rs

@@ -37,10 +37,8 @@ pub fn unify<'config>(config: &'config Config, repo: &Repository) -> Config<'con
                 ONE_FIXUP_PER_COMMIT_DEFAULT,
             ),
         force_author: config.force_author
-            || config.force
             || bool_value(&repo, FORCE_AUTHOR_CONFIG_NAME, FORCE_AUTHOR_DEFAULT),
         force_detach: config.force_detach
-            || config.force
             || bool_value(&repo, FORCE_DETACH_CONFIG_NAME, FORCE_DETACH_DEFAULT),
         ..*config
     }

src/lib.rs

@@ -13,9 +13,6 @@ pub struct Config<'a> {
     pub dry_run: bool,
     pub force_author: bool,
     pub force_detach: bool,
-    // force should only be used to enable oher force_* values when unifiying the config.
-    // Do not access when disabling individual safety checks.
-    pub force: bool,
     pub base: Option<&'a str>,
     pub and_rebase: bool,
     pub whole_file: bool,
@@ -31,8 +28,6 @@ pub fn run(logger: &slog::Logger, config: &Config) -> Result<()> {
 
 fn run_with_repo(logger: &slog::Logger, config: &Config, repo: &git2::Repository) -> Result<()> {
     let config = config::unify(&config, repo);
-    // have force flag enable all force* flags
-
     let stack = stack::working_stack(
         repo,
         config.base,
@@ -566,28 +561,6 @@ mod tests {
         assert!(nothing_left_in_index(&ctx.repo).unwrap());
     }
 
-    #[test]
-    fn foreign_author_with_force_flag() {
-        let ctx = repo_utils::prepare_and_stage();
-
-        repo_utils::become_new_author(&ctx.repo);
-
-        // run 'git-absorb'
-        let drain = slog::Discard;
-        let logger = slog::Logger::root(drain, o!());
-        let config = Config {
-            force: true,
-            ..DEFAULT_CONFIG
-        };
-        run_with_repo(&logger, &config, &ctx.repo).unwrap();
-
-        let mut revwalk = ctx.repo.revwalk().unwrap();
-        revwalk.push_head().unwrap();
-        assert_eq!(revwalk.count(), 3);
-
-        assert!(nothing_left_in_index(&ctx.repo).unwrap());
-    }
-
     #[test]
     fn foreign_author_with_force_author_config() {
         let ctx = repo_utils::prepare_and_stage();
@@ -630,15 +603,15 @@ mod tests {
     }
 
     #[test]
-    fn detached_head_pointing_at_branch_with_force_flag() {
+    fn detached_head_pointing_at_branch_with_force_detach_flag() {
         let ctx = repo_utils::prepare_and_stage();
         repo_utils::detach_head(&ctx.repo);
 
         // run 'git-absorb'
         let drain = slog::Discard;
         let logger = slog::Logger::root(drain, o!());
         let config = Config {
-            force: true,
+            force_detach: true,
             ..DEFAULT_CONFIG
         };
         run_with_repo(&logger, &config, &ctx.repo).unwrap();
@@ -671,27 +644,6 @@ mod tests {
         assert!(nothing_left_in_index(&ctx.repo).unwrap());
     }
 
-    #[test]
-    fn detached_head_with_force_flag() {
-        let ctx = repo_utils::prepare_and_stage();
-        repo_utils::detach_head(&ctx.repo);
-        repo_utils::delete_branch(&ctx.repo, "master");
-
-        // run 'git-absorb'
-        let drain = slog::Discard;
-        let logger = slog::Logger::root(drain, o!());
-        let config = Config {
-            force: true,
-            ..DEFAULT_CONFIG
-        };
-        run_with_repo(&logger, &config, &ctx.repo).unwrap();
-        let mut revwalk = ctx.repo.revwalk().unwrap();
-        revwalk.push_head().unwrap();
-
-        assert_eq!(revwalk.count(), 3);
-        assert!(nothing_left_in_index(&ctx.repo).unwrap());
-    }
-
     #[test]
     fn detached_head_with_force_detach_config() {
         let ctx = repo_utils::prepare_and_stage();
@@ -834,7 +786,6 @@ mod tests {
         dry_run: false,
         force_author: false,
         force_detach: false,
-        force: false,
         base: None,
         and_rebase: false,
         whole_file: false,

src/main.rs

@@ -97,9 +97,8 @@ fn main() {
         &logger,
         &git_absorb::Config {
             dry_run,
-            force_author,
-            force_detach,
-            force,
+            force_author: force_author || force,
+            force_detach: force_detach || force,
             base: base.as_deref(),
             and_rebase,
             whole_file,