tor

commit 7f0516022bb84378df13136273b42019e54157f9
parent 0deea98d021d105eeb5dc5c43c144847ad188ea5
Author: rl1987 <rl1987@sdf.lonestar.org>
Date:   Fri, 22 Feb 2019 17:05:07 +0200

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

Diffstat:
M
scripts/maint/pre-push.git-hook
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/maint/pre-push.git-hook b/scripts/maint/pre-push.git-hook
@@ -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