From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 30 May 2008 12:19:16 +0000 (+0200)
Subject: fixes in pre-receive tool
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f6844dd12667161b33637d1146a3091bcdb540b6;p=alsa.git

fixes in pre-receive tool
---

diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive
index 7f96fd1..d7f66fe 100755
--- a/hooks/alsa-kernel.git/pre-receive
+++ b/hooks/alsa-kernel.git/pre-receive
@@ -199,13 +199,15 @@ def try_to_merge(commit):
                 afile1 = to_alsa_file(file1, 'a/')
                 afile2 = to_alsa_file(file2, 'b/')
                 rlines.append('diff --git %s %s\n' % (afile1, afile2))
-                if ok2:
-                    addfiles.append(afile2[2:])
-                elif ok1:
-                    rmfiles.append(afile1[2:])
+                addfiles.append(to_alsa_file(file1, 'a/')[2:])
                 ok = True
         elif ok and (line.startswith('--- a/') or line.startswith('+++ b/')):
             rlines.append(line[:6] + to_alsa_file(line[6:].strip()) + '\n')
+        elif ok and line.startswith('+++ /dev/null'):
+            spec = to_alsa_file(file1, 'a/')[2:]
+            rmfiles.append(spec)
+            addfiles.remove(spec)
+            rlines.append(line)
         elif ok:
             rlines.append(line)
     fp.close()
@@ -366,7 +368,7 @@ def compare_trees(lastref):
             rmtree("alsa-kmirror-repo/%s" % i)
         elif exists("alsa-kmirror-repo/%s" % i):
             remove("alsa-kmirror-repo/%s" % i)
-    for i in ['oss']:
+    for i in ['oss', 'pci/ac97/ak4531_codec.c']:
         if isdir("alsa-kernel-repo/%s" % i):
             rmtree("alsa-kernel-repo/%s" % i)
         elif exists("alsa-kernel-repo/%s" % i):