test(traverse): ensure tests use 'merge.ff false' and recreate fixtures on each run

Author: oknozor

.gitignore

@@ -7,5 +7,4 @@ target/
 # repositories used for local testing
 /tests/fixtures/repos
 
-**/generated/
-.idea
+**/generated-do-not-edit/

git-traverse/tests/fixtures/make_traversal_repo_for_commits.sh

@@ -3,6 +3,7 @@ set -eu -o pipefail
 
 git init -q
 git config commit.gpgsign false
+git config merge.ff false
 
 git checkout -q -b main
 git commit -q --allow-empty -m c1

tests/tools/src/lib.rs

@@ -74,7 +74,7 @@ pub fn scripted_fixture_repo_read_only_with_args(
             crc_digest.finalize()
         })
         .to_owned();
-    let script_result_directory = fixture_path(Path::new("generated").join(format!("{}", script_identity)));
+    let script_result_directory = fixture_path(Path::new("generated-do-not-edit").join(format!("{}", script_identity)));
     if !script_result_directory.is_dir() {
         std::fs::create_dir_all(&script_result_directory)?;
         let script_absolute_path = std::env::current_dir()?.join(script_path);