summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-14 11:39:16 +0100
committerErich Eckner <git@eckner.net>2018-11-14 11:39:16 +0100
commitf55587e9f0e115cfe7353dbe9d4feb43ba4c26f9 (patch)
tree87bdc0cad3218f110e67608d13aae14e98d6715d
parent1c085647b60eb93e44185bdf7dcbe2a5b8f4befd (diff)
downloaddevops-f55587e9f0e115cfe7353dbe9d4feb43ba4c26f9.tar.xz
update-kernel-config: sort config before git diff'ing it
-rwxr-xr-xupdate-kernel-config11
1 files changed, 10 insertions, 1 deletions
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 '^+++\|^---'
)