Also disallow pushing to/from upstream branch when branch names do not match

This commit is contained in:
rl1987
2019-02-22 17:05:07 +02:00
committed by David Goulet
parent 0deea98d02
commit 7f0516022b
+3 -2
View File
@@ -44,8 +44,9 @@ do
range="$remote_sha..$local_sha"
fi
if ref_is_upstream_branch "$local_ref" == 0 ||
ref_is_upstream_branch "$remote_ref" == 0
if (ref_is_upstream_branch "$local_ref" == 0 ||
ref_is_upstream_branch "$remote_ref" == 0) &&
[ "$local_ref" != "$remote_ref" ]
then
if [ "$remote" == "origin" ]
then