fixed all errors when generating patches
This commit is contained in:
parent
887c730aa9
commit
341ee34eb0
@ -15,6 +15,8 @@ applyPatch() {
|
|||||||
fi
|
fi
|
||||||
echo "$basedir/$target"
|
echo "$basedir/$target"
|
||||||
cd "$basedir/$target"
|
cd "$basedir/$target"
|
||||||
|
#git checkout -d origin
|
||||||
|
git checkout $branch
|
||||||
echo "Resetting $target to $what..."
|
echo "Resetting $target to $what..."
|
||||||
git config commit.gpgSign false
|
git config commit.gpgSign false
|
||||||
echo " Applying patches to $target..."
|
echo " Applying patches to $target..."
|
||||||
|
@ -29,7 +29,7 @@ savePatches() {
|
|||||||
target=$2
|
target=$2
|
||||||
branch=$3
|
branch=$3
|
||||||
cd "$basedir/$target"
|
cd "$basedir/$target"
|
||||||
git format-patch --no-stat -N -o "../${what}-Patches/" $branch
|
git format-patch --no-stat -N -o "../${what}-Patches/" origin/$branch
|
||||||
cd "$basedir"
|
cd "$basedir"
|
||||||
git add -A "${what}-Patches"
|
git add -A "${what}-Patches"
|
||||||
if [ "$clean" != "clean" ]; then
|
if [ "$clean" != "clean" ]; then
|
||||||
|
Reference in New Issue
Block a user