diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index c6be2bcc..bef26870 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 3 14:12:56 UTC 2019 - olaf@aepfle.de + +- Modify update_git.sh script: + pass --zero-commit to format-patch + This removes needless noise in the buildservice when the same set + of patches is imported/exported at different times by different users. + pass --no-signature to format-patch + Remove sed call which used to remove the signature, use mv instead + ------------------------------------------------------------------- Fri Dec 14 06:24:53 UTC 2018 - lma@suse.com diff --git a/qemu.changes b/qemu.changes index c6be2bcc..bef26870 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 3 14:12:56 UTC 2019 - olaf@aepfle.de + +- Modify update_git.sh script: + pass --zero-commit to format-patch + This removes needless noise in the buildservice when the same set + of patches is imported/exported at different times by different users. + pass --no-signature to format-patch + Remove sed call which used to remove the signature, use mv instead + ------------------------------------------------------------------- Fri Dec 14 06:24:53 UTC 2018 - lma@suse.com diff --git a/update_git.sh b/update_git.sh index 4e1782d8..517d7ede 100644 --- a/update_git.sh +++ b/update_git.sh @@ -214,6 +214,8 @@ else # not based on LATEST upstream master, rather any upstream commitish fi (cd $GIT_DIR && git format-patch -N --stat=72 --indent-heuristic \ + --zero-commit \ + --no-signature \ $GIT_UPSTREAM_COMMIT_ISH --suffix= -o $CMP_DIR --no-renames >/dev/null) check_patch() @@ -241,10 +243,7 @@ rm -rf $GIT_DIR # chars before extension and remove git signature. ('30' below gets us past # dir prefix) for i in $CMP_DIR/*; do - # 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 + mv $i $CMP_DIR/${i:30:40}.patch done for i in 0???-*.patch; do