From e3ed4b4b7f60f5e992bd7f62b01f9f3f365b23465e092a8d120b50c52dc40768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 17 Mar 2016 16:12:29 +0000 Subject: [PATCH] Accepting request 374295 from home:olh:branches:Virtualization Handle signatures added by git format-patch properly OBS-URL: https://build.opensuse.org/request/show/374295 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=288 --- update_git.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/update_git.sh b/update_git.sh index 78e1d8e0..a0cc0b0f 100644 --- a/update_git.sh +++ b/update_git.sh @@ -60,7 +60,9 @@ rm -rf $GIT_DIR # Process patches to eliminate useless differences: limit file names to 40 chars # before extension and remove git signature. ('30' below gets us past dir prefix) for i in $CMP_DIR/*; do - head -n -3 $i > $CMP_DIR/${i:30:40}.patch + # format-patch may append a signature, which per default contains the git version + # wipe everything starting from the signature tag + sed '/^-- $/Q' $i > $CMP_DIR/${i:30:40}.patch rm $i done