Compare commits
No commits in common. "efabda309b2f611a193d42594517f7ebc0a1dd77" and "76e7de6d5330826a5b54b933645ea4f7e3330e1a" have entirely different histories.
efabda309b
...
76e7de6d53
1 changed files with 4 additions and 7 deletions
|
@ -21,10 +21,10 @@ old="${last_tag#?}"
|
||||||
|
|
||||||
if [ "$1" = "--autoupdate" ]; then
|
if [ "$1" = "--autoupdate" ]; then
|
||||||
new="$2"
|
new="$2"
|
||||||
autoupdate="y"
|
autogit="y"
|
||||||
else
|
else
|
||||||
new="$1"
|
new="$1"
|
||||||
autoupdate="n"
|
autogit="n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
name="$(git config --get user.name)"
|
name="$(git config --get user.name)"
|
||||||
|
@ -52,16 +52,13 @@ cd ..
|
||||||
|
|
||||||
rm "$PACKAGE"_"$old"-*
|
rm "$PACKAGE"_"$old"-*
|
||||||
|
|
||||||
if [ "$autoupdate" = "n" ]; then
|
if [ "$autogit" = "n" ]; then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git add -A
|
|
||||||
git commit -m "Upstream version $new"
|
|
||||||
|
|
||||||
git switch main
|
git switch main
|
||||||
git merge --ff-only version-"$new"
|
git merge --ff-only version-"$new"
|
||||||
git push origin main
|
git push origin main
|
||||||
|
|
||||||
git tag -a v"$new" "Upstream version $new"
|
git tag -s v"$new" "Upstream version $new"
|
||||||
git push --tags origin main
|
git push --tags origin main
|
||||||
|
|
Loading…
Add table
Reference in a new issue