fix: bump check error

crates/xtask-bump-check/src/xtask.rs

@@ -333,10 +333,8 @@ fn changed<'r, 'ws>(
             (relative_pkg_root, pkg)
         })
         .collect::<Vec<_>>();
-    let base_tree = base_commit.as_object().peel_to_tree()?;
-    let head_tree = head.as_object().peel_to_tree()?;
-    let diff = repo.diff_tree_to_tree(Some(&base_tree), Some(&head_tree), Default::default())?;
 
+    let diff = symmetric_diff(repo, base_commit, head).unwrap();
     let mut changed_members = HashMap::new();
 
     for delta in diff.deltas() {
@@ -354,6 +352,29 @@ fn changed<'r, 'ws>(
     Ok(changed_members)
 }
 
+/// Using a "symmetric difference" between base and head.
+fn symmetric_diff<'a>(repo: &'a git2::Repository, base: &'a git2::Commit<'a>, head: &'a git2::Commit<'a>) -> CargoResult<git2::Diff<'a>> {
+    let ancestor_oid = repo.merge_base(base.id(), head.id()).unwrap();
+    let ancestor_commit = repo.find_commit(ancestor_oid).unwrap();
+    let ancestor_tree = ancestor_commit.as_object().peel_to_tree()?;
+    let head_tree = head.as_object().peel_to_tree()?;
+    let mut diff = repo.diff_tree_to_tree(
+        Some(&ancestor_tree),
+        Some(&head_tree),
+        Default::default(),
+    )?;
+    if ancestor_commit.id() != base.id() {
+        let base_tree = base.as_object().peel_to_tree()?;
+        let diff_base = repo.diff_tree_to_tree(
+            Some(&ancestor_tree),
+            Some(&base_tree),
+            Default::default(),
+        )?;
+        diff.merge(&diff_base).unwrap();
+    }
+    Ok(diff)
+}
+
 /// Compares version against published crates on crates.io.
 ///
 /// Assumption: We always release a version larger than all existing versions.