From f55587e9f0e115cfe7353dbe9d4feb43ba4c26f9 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 14 Nov 2018 11:39:16 +0100
Subject: update-kernel-config: sort config before git diff'ing it

---
 update-kernel-config | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/update-kernel-config b/update-kernel-config
index b4d78f2..a4d54b6 100755
--- a/update-kernel-config
+++ b/update-kernel-config
@@ -33,7 +33,16 @@ config_names=$(
 )
 
 diff=$(
-  git -C "${upstream_git_path}/$2/repos/$1-x86_64" diff "${old_revision}" HEAD -- config | \
+  diff -u <(
+      git -C "${upstream_git_path}/$2/repos/$1-x86_64" archive "${old_revision}" -- config | \
+        tar -Ox | \
+        sort
+    ) \
+    <(
+      git -C "${upstream_git_path}/$2/repos/$1-x86_64" archive HEAD -- config | \
+        tar -Ox | \
+        sort
+    ) | \
     grep '^[+-].' | \
     grep -v '^+++\|^---'
 )
-- 
cgit v1.2.3