Commit 24230299 by Francisco Giordano

amend merge-upstream.sh to default to master on patches

parent 2ab4f9e4
...@@ -8,8 +8,7 @@ if [[ "$REF" != refs/heads/* ]]; then ...@@ -8,8 +8,7 @@ if [[ "$REF" != refs/heads/* ]]; then
echo "$REF is not a branch" >&2 echo "$REF is not a branch" >&2
exit 1 exit 1
elif [[ "$REF" == refs/heads/patches ]]; then elif [[ "$REF" == refs/heads/patches ]]; then
echo "Run on a different branch" >&2 REF=refs/heads/master
exit 1
fi fi
set -x set -x
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment