rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make do-rebase generate proper patches regardless of git config

Browse Source 
The do-rebase script generate patches with git-format-patch, but the pkg
expects some non-default git configurations for the diffs and stats.

So instead requiring developers to setup these config options, pass them
to git-format-patch in do-rebase to generate the proper patches.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2018-05-11 16:33:02 +02:00 committed by Peter Jones
parent 67f30b6a74
commit 97a85089d6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
do-rebase
View File

@ -6,7 +6,9 @@ shopt -qs expand_aliases
export LC_COLLATE=C export LC_COLLATE=C
export LC_ALL=C export LC_ALL=C
format_patch_ops="--stat=80 --summary -O.git.diff.order --patience -l0"
alias othergit="GIT_DIR=$PWD/.rhboot.git GIT_WORK_TREE=$PWD git" alias othergit="GIT_DIR=$PWD/.rhboot.git GIT_WORK_TREE=$PWD git"
alias formatpatch="othergit format-patch $format_patch_ops"
usage() usage()
{ {
@ -119,7 +121,7 @@ unset LC_ALL
git rm -q 0*.patch git rm -q 0*.patch
> grub.patches > grub.patches
patches=$(othergit format-patch grub-2.02..refs/remotes/rhboot/${releasever}) patches=$(formatpatch grub-2.02..refs/remotes/rhboot/${releasever})
for x in $patches ; do for x in $patches ; do
echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches
done done