From b4911bf5915ed2110088dbc063cf0ec68bb4aecf Mon Sep 17 00:00:00 2001
From: David Bold <dave@ipp.mpg.de>
Date: Mon, 9 Mar 2026 12:03:06 +0100
Subject: [PATCH] sort .git-blame-ignore-revs

This should reduce the number of merge conflicts
if we do not always append to the file
---
 .git-blame-ignore-revs                | 13 +++++--------
 .github/workflows/auto-formatting.yml |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8f35bd9366..7fa93bb819 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,15 +1,12 @@
-# Clang-format whole repo
-d8f14fdddb5ca0fbb32d8e2bf5ac2960d6ac5ce6
-ed2117e6d6826a98b6988e2f18c0c34e408563b6
-# CMake formatting
+05b7c571544c3bcb153fce67d12b9ac48947fc2d
 17ac13c28aa3b34a0e46dbe87bb3874f6b25e706
-# Added by the bot
+2c2402ed59c91164eaff46dee0f79386b7347e9e
 4b010b7634aee1045743be80c268d4644522cd29
 52301380586fdbf890f620c04f689b08d89a6c34
-a71cad2dd6ace5741a754e2ca7daacd4bb094e0e
 83cf77923a4c72e44303354923021acf932b4fd2
-2c2402ed59c91164eaff46dee0f79386b7347e9e
-05b7c571544c3bcb153fce67d12b9ac48947fc2d
+a71cad2dd6ace5741a754e2ca7daacd4bb094e0e
 c8f38049359170a34c915e209276238ea66b9a1e
+d8f14fdddb5ca0fbb32d8e2bf5ac2960d6ac5ce6
 ec69e8838be2dde140a915e50506f8e1ce3cb534
+ed2117e6d6826a98b6988e2f18c0c34e408563b6
 f2bc0488a298f136294c523bc5ab4086d090059b
diff --git a/.github/workflows/auto-formatting.yml b/.github/workflows/auto-formatting.yml
index b7f1584515..a68a62a8a7 100644
--- a/.github/workflows/auto-formatting.yml
+++ b/.github/workflows/auto-formatting.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Ignore formatting
         run: |
           msg=$(git rev-list --format=%s --max-count=1 HEAD|tail -n -1)
-          test "$msg" = "[bot] Apply format changes" && git rev-parse HEAD >> .git-blame-ignore-revs || :
+          test "$msg" = "[bot] Apply format changes" && git rev-parse HEAD >> .git-blame-ignore-revs && sort .git-blame-ignore-revs --output=.git-blame-ignore-revs || :
 
       - name: Commit formatting
         uses: stefanzweifel/git-auto-commit-action@v7