rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

do-rebase: add more options to not depend on the user git configuration

Browse Source 
The patches generated by do-rebase depend on the user having core.abbrv=11
in their .gitconfig and also a diff.orderFile set.

These assumptions were removed for the git format-patch command by passing
all the configuration as options, but it was still present for git diff.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2018-10-23 12:03:52 +02:00
parent db4a99687c
commit 682540cbf5
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
do-rebase
View File

@ -6,7 +6,8 @@ shopt -qs expand_aliases
export LC_COLLATE=C
export LC_ALL=C
format_patch_ops="--zero-commit --no-signature --no-numbered --stat=80 --summary -O.git.diff.order --patience -l0"
diff_ops="-O.git.diff.order --patience -l0"
format_patch_ops="--zero-commit --no-signature --no-numbered --stat=80 --summary $diff_ops"
alias othergit="GIT_DIR=$PWD/.rhboot.git GIT_WORK_TREE=$PWD git"
alias formatpatch="othergit format-patch $format_patch_ops"
@ -126,6 +127,7 @@ fi
if [ ! -d $PWD/.rhboot.git ]; then
othergit init
othergit config core.abbrev 11
if ! othergit remote add \
rhboot $gitrepo \
>/dev/null 2>&1 ; then
@ -154,7 +156,7 @@ unset LC_ALL
git rm -q 0*.patch
> release-to-master.patch
othergit diff --full-index --binary grub-2.02..refs/remotes/rhboot/master > release-to-master.patch
othergit diff --full-index --binary $diff_ops grub-2.02..refs/remotes/rhboot/master > release-to-master.patch
git add release-to-master.patch
> grub.patches