From 82cd1464e02c2cc603c619f9868a77c5b7d9238f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 28 Jul 2008 16:50:58 +0200 Subject: [PATCH] pre-receive (alsa-kernel): Fix merging of patches touching files out of ALSA tree Signed-off-by: Jaroslav Kysela --- hooks/alsa-kernel.git/pre-receive | 1 + 1 file changed, 1 insertion(+) diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive index 35e7948..0979e2a 100755 --- 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/') -- 2.47.1