From 77783365088056a3d6b2436e6aaceb96f1495208 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 20 Jun 2008 14:18:26 +0200 Subject: [PATCH] alsa-kernel/pre-receive hook: fix DO_NOT_MERGE and DO_NOT_FAIL conditions --- hooks/alsa-kernel.git/pre-receive | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive index 894a2e5..de6638f 100755 --- a/hooks/alsa-kernel.git/pre-receive +++ b/hooks/alsa-kernel.git/pre-receive @@ -399,7 +399,7 @@ def compare_trees(lastref): rmtree(worktreek, ignore_errors=True) if notempty: stderr.write('PRE-RECEIVE: repositories does not match, please, fix it\n') - if DO_NOT_FAIL: + if not DO_NOT_FAIL: fail() return False return True @@ -419,7 +419,7 @@ for line in lines: elif refname != 'refs/heads/master': stderr.write('PRE-RECEIVE: invalid branch "%s"\n' % refname) fail() - if DO_NOT_MERGE: + if not DO_NOT_MERGE: if not lastref: read_upstream_commits(lines[0][:-1].split(' ')[0]) do_check(sha1old, sha1new, refname) -- 2.47.3