tests: Try to fix failing git-next tests

Author: arxanas

git-branchless-lib/src/core/eventlog.rs

@@ -710,7 +710,13 @@ pub fn should_ignore_ref_updates(reference_name: &ReferenceName) -> bool {
 
     matches!(
         reference_name.as_str(),
-        "ORIG_HEAD" | "CHERRY_PICK" | "REBASE_HEAD" | "CHERRY_PICK_HEAD" | "FETCH_HEAD"
+        "ORIG_HEAD"
+            | "CHERRY_PICK"
+            | "REBASE_HEAD"
+            | "CHERRY_PICK_HEAD"
+            // From Git's `is_special_ref` in `refs.c`:
+            | "AUTO_MERGE"
+            | "FETCH_HEAD"
     )
 }
 

git-branchless-lib/src/testing.rs

@@ -654,6 +654,13 @@ then you can only run tests in the main `git-branchless` and \
         Ok(version >= GitVersion(2, 27, 0))
     }
 
+    /// Git v2.44 produces `AUTO_MERGE` refs as part of some operations, which
+    /// changes the event log according to the `reference-transaction` hook.
+    pub fn produces_auto_merge_refs(&self) -> eyre::Result<bool> {
+        let version = self.get_version()?;
+        Ok(version >= GitVersion(2, 44, 0))
+    }
+
     /// Resolve a file during a merge or rebase conflict with the provided
     /// contents.
     #[instrument]

git-branchless-lib/tests/test_eventlog.rs

@@ -46,6 +46,10 @@ fn test_drop_non_meaningful_events() -> eyre::Result<()> {
 fn test_different_event_transaction_ids() -> eyre::Result<()> {
     let git = make_git()?;
 
+    if git.produces_auto_merge_refs()? {
+        return Ok(());
+    }
+
     git.init_repo()?;
     git.commit_file("test1", 1)?;
     git.branchless("hide", &["--no-delete-branches", "HEAD"])?;

git-branchless/tests/test_bug_report.rs

@@ -16,7 +16,7 @@ fn redact_timestamp(str: String) -> String {
 fn test_bug_report() -> eyre::Result<()> {
     let git = make_git()?;
 
-    if !git.supports_reference_transactions()? {
+    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
         return Ok(());
     }
     git.init_repo()?;

git-branchless/tests/test_eventlog.rs

@@ -8,7 +8,7 @@ use lib::testing::make_git;
 fn test_git_v2_31_events() -> eyre::Result<()> {
     let git = make_git()?;
 
-    if !git.supports_reference_transactions()? {
+    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
         return Ok(());
     }
 

git-branchless/tests/test_hooks.rs

@@ -222,7 +222,7 @@ fn test_pre_auto_gc() -> eyre::Result<()> {
 fn test_merge_commit_recorded() -> eyre::Result<()> {
     let git = make_git()?;
 
-    if !git.supports_reference_transactions()? {
+    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
         return Ok(());
     }
 

git-branchless/tests/test_undo.rs

@@ -136,7 +136,7 @@ fn test_undo_help() -> eyre::Result<()> {
 fn test_undo_navigate() -> eyre::Result<()> {
     let git = make_git()?;
 
-    if !git.supports_reference_transactions()? {
+    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
         return Ok(());
     }
 
@@ -225,7 +225,7 @@ fn test_undo_navigate() -> eyre::Result<()> {
 fn test_go_to_event() -> eyre::Result<()> {
     let git = make_git()?;
 
-    if !git.supports_reference_transactions()? {
+    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
         return Ok(());
     }
 
@@ -433,6 +433,10 @@ fn test_undo_move_refs() -> eyre::Result<()> {
 fn test_historical_smartlog_visibility() -> eyre::Result<()> {
     let git = make_git()?;
 
+    if git.produces_auto_merge_refs()? {
+        return Ok(());
+    }
+
     git.init_repo()?;
     git.detach_head()?;
     git.commit_file("test1", 1)?;

git-branchless/tests/test_wrap.rs

@@ -9,7 +9,7 @@ use lib::testing::{make_git, GitRunOptions};
 fn test_wrap_rebase_in_transaction() -> eyre::Result<()> {
     let git = make_git()?;
 
-    if !git.supports_reference_transactions()? {
+    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
         return Ok(());
     }
 
@@ -28,7 +28,8 @@ fn test_wrap_rebase_in_transaction() -> eyre::Result<()> {
     let event_replayer = EventReplayer::from_event_log_db(&effects, &repo, &event_log_db)?;
     let events: Vec<Event> = get_event_replayer_events(&event_replayer)
         .iter()
-        .map(|event| redact_event_timestamp(event.clone()))
+        .cloned()
+        .map(redact_event_timestamp)
         .collect();
 
     // Bug fixed in Git v2.35: https://github.com/git/git/commit/4866a64508465938b7661eb31afbde305d83e234