pre-receive (alsa-kernel): Fix merging of patches touching files out of ALSA tree

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive
index 35e79485d13e9227b5b2d79a508c2021079d8f2b..0979e2a32c97a311c9b0be02e11f1db6c48c84a7 100755 (executable)
--- a/hooks/alsa-kernel.git/pre-receive
+++ b/hooks/alsa-kernel.git/pre-receive
@@ -206,6 +206,7 @@ def try_to_merge(commit):
             file2 = file2.strip()
             ok1 = is_alsa_file(file1[2:])
             ok2 = is_alsa_file(file2[2:])
+            ok = False
             if ok1 or ok2:
                 afile1 = to_alsa_file(file1, 'a/')
                 afile2 = to_alsa_file(file2, 'b/')