rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 07:44:52 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Update do-rebase.

Browse source 
Since this is now based on the 2.02-beta3 tarball, we shouldn't be
diffing from master.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-01-17 12:40:47 -05:00
parent e085cbca8b
commit 4a26083657
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
do-rebase
View file

@ -82,12 +82,9 @@ if [ $# -ge 1 ]; then
usage 1
fi
if ! git remote show -n github >/dev/null 2>&1 ; then
git remote add \
github git@github.com:vathpela/grub2-fedora.git >/dev/null 2>&1
echo "Could not add remote: github" 1>&2
exit 1
fi
git remote add \
github git@github.com:vathpela/grub2-fedora.git >/dev/null 2>&1 \
|| :
git fetch github
remote=$(git branch --list -r "github/${releasever}" 2>/dev/null)
@ -98,26 +95,17 @@ fi
unset LC_ALL
git rm -q 0*.patch
(cat <<EOF
From: Peter Jones <pjones@redhat.com>
Date: Wed Jul 22 10:18:00 2015 -0400
Subject: Stop trying to "git format-patch" across a merge that confuses it
EOF
git diff --full-index --binary refs/tags/grub-2.02-beta3..refs/remotes/github/master
) > grub-2.02-beta3-to-origin-master.patch
patches=$(git format-patch refs/remotes/github/master..refs/remotes/github/${releasever})
echo Patch0000: grub-2.02-beta3-to-origin-master.patch > grub.patches
patches=$(git format-patch grub-2.02-beta3..refs/remotes/github/${releasever})
echo -n > grub.patches
for x in $patches ; do
echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches
done
if [ -z "$amend" ]; then
rpmdev-bumpspec -c "- Rebased to newer upstream for ${releasever}" grub2.spec
fi
git add 0*.patch grub2.spec grub-2.02-beta3-to-origin-master.patch grub.patches
git add 0*.patch grub2.spec grub.patches
if [ -z "$amend" ]; then
fedpkg commit -s -c $amend
else
git commit -m "" --amend
git commit --amend
fi