summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-03 20:54:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-03 20:54:26 (GMT)
commite5be297279e8ee8c503eb59da21ab17edc40e748 (patch)
tree23dff8ccf588bae744b107ec994be2bd9d551628 /templates
parenta3bc3d070cacf07dbe11b4bfec57554c8bbf1957 (diff)
parent6897a64b652d83e477389ec1a248b47b8d821db6 (diff)
downloadgit-e5be297279e8ee8c503eb59da21ab17edc40e748.zip
git-e5be297279e8ee8c503eb59da21ab17edc40e748.tar.gz
git-e5be297279e8ee8c503eb59da21ab17edc40e748.tar.bz2
Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2: fix shell syntax error in template
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/hooks--pre-push.sample1
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample
index 15ab6d8..1f3bceb 100755
--- 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