build: reset branches that start with "volatile/"
It helps with branch rewrite as we pull new updates from FreeBSD stable branch without the need for merges. We also upstreamed a few patches so our own stash on top is getting thinner as a bonus.
This commit is contained in:
parent
87f1ae435e
commit
5832c9c636
|
@ -353,10 +353,15 @@ git_clone()
|
|||
|
||||
git_pull()
|
||||
{
|
||||
echo ">>> Pulling branch ${2} of ${1}:"
|
||||
echo ">>> Updating branch ${2} of ${1}:"
|
||||
|
||||
git -C ${1} checkout ${2}
|
||||
git -C ${1} pull
|
||||
|
||||
if [ -z "${2%%volatile/*}" ]; then
|
||||
git_reset ${1} origin/${2}
|
||||
else
|
||||
git -C ${1} pull
|
||||
fi
|
||||
}
|
||||
|
||||
git_describe()
|
||||
|
|
Loading…
Reference in New Issue