diff options
Diffstat (limited to 'scripts/update-patches-git')
| -rw-r--r-- | scripts/update-patches-git | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/scripts/update-patches-git b/scripts/update-patches-git index 8337fa847..6f0bbfedb 100644 --- a/scripts/update-patches-git +++ b/scripts/update-patches-git @@ -3,29 +3,20 @@ # Update patches using git-format-patch from a source tree prepared by # patch_git.sh. # -# (c) 2016 Phil Sutter <phil@nwl.cc> +# (c) 2021 Phil Sutter <phil@nwl.cc> wrkdist=$1 wd=$(pwd) cd "$wrkdist" -top="" -top_series="" -git log --grep="^OpenADK patch marker:" --oneline | while read hash subject; do - [ -n "$top" ] || { - top=$hash - top_series="${subject#OpenADK patch marker: }" - continue - } - bottom=$hash - bottom_series="${subject#OpenADK patch marker: }" - - patchdir=$(<.git/patch_tmp/${top_series}/__patchdir__) +top="HEAD" +git log --grep='^OpenADK patch marker:' --format='%H %s'$logopt | \ + while read hash o p m series; do + patchdir=$(<.git/patch_tmp/${series}/__patchdir__) while read patchfile; do rm ${patchdir}/$patchfile - done < .git/patch_tmp/${top_series}/__patchfiles__ - git format-patch -N -o "$patchdir" ${bottom}..${top} - - top=$bottom - top_series=$bottom_series + done < .git/patch_tmp/${series}/__patchfiles__ + git format-patch --no-numbered --no-signoff --no-cover-letter \ + --no-signature -o "$patchdir" ${hash}..${top} + top=${hash}^ done |