... | ... | @@ -162,7 +162,7 @@ patchrev=1; # EXAMPLE ONLY |
|
|
# get latest upstream code
|
|
|
git checkout ${upbranch};
|
|
|
git pull ${upstream} ${upbranch};
|
|
|
git fetch --tags ${upstream};
|
|
|
git fetch --tags ${upstream} --force; # force needed for upstream 'releases/latest'
|
|
|
git push origin ${upbranch} # not --all because don't care about tags on the server
|
|
|
|
|
|
# rebase patches
|
... | ... | @@ -171,7 +171,7 @@ git rebase ${upbranch}; # check this worked correctly! |
|
|
git push origin ${mybranch} --force;
|
|
|
|
|
|
# create release branch and tag
|
|
|
last_tag=$(git describe --tags $(git rev-list --tags --max-count=1));
|
|
|
last_tag=$(git tag --list --sort=-v:refname | head -n 1);
|
|
|
git branch ${mybranch}-${last_tag};
|
|
|
git tag ${mybranch}-${last_tag}_p${patchrev} ${mybranch}-${last_tag};
|
|
|
git push origin ${mybranch}-${last_tag};
|
... | ... | |