mirror of
https://git.rockylinux.org/rocky/pungi-rocky.git
synced 2024-12-05 10:56:26 +00:00
sync from upstream
This commit is contained in:
parent
3aff6ed6e3
commit
d5d2476b71
@ -80,6 +80,7 @@ additional_packages = [
|
||||
"ecj", #ENGCMP-2939
|
||||
"egl-utils",
|
||||
"frr-selinux",
|
||||
"gcc-toolset-13-annobin",
|
||||
"inkscape1",
|
||||
"inkscape1-docs",
|
||||
"inkscape1-view",
|
||||
|
20
sync-from-upstream
Executable file
20
sync-from-upstream
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
HOWMANY="-$1"
|
||||
if [ -z $1 ]; then
|
||||
HOWMANY="-1"
|
||||
fi
|
||||
|
||||
BRANCH=$(git branch --show-current)
|
||||
if [[ ! "${BRANCH}" =~ "r8s" ]]; then
|
||||
echo "Not a lookahead branch."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Fetching from upstream"
|
||||
git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-8-stream
|
||||
echo "Formatting patch and applying..."
|
||||
git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
|
||||
echo "!! DIFF OF CHANGES !!"
|
||||
git --no-pager diff HEAD
|
||||
|
||||
echo "You may now commit and push."
|
Loading…
Reference in New Issue
Block a user