Merge branch 'maint-1.8.2' into maint-1.8.3

* maint-1.8.2: fix shell syntax error in template
2013-09-03 13:54:26 -07:00 · 2013-09-03 13:54:26 -07:00 · e5be297279
commit e5be297279
parent a3bc3d070c 6897a64b65
1 changed files with 1 additions and 0 deletions
--- a/templates/hooks--pre-push.sample
+++ b/templates/hooks--pre-push.sample
@ -30,6 +30,7 @@ do
 	if [ "$local_sha" = $z40 ]
 	then
 		# Handle delete
+		:
 	else
 		if [ "$remote_sha" = $z40 ]
 		then