From 5ef1f395fc0b2da8ff088360185d7feeb7624216 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 5 Mar 2009 12:09:59 +0100
Subject: [PATCH] pre-receive: add cs4232.c to removed files

---
 alsatool                          | 15 ++++++++++++---
 hooks/alsa-kernel.git/pre-receive |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/alsatool b/alsatool
index c474992..69c2925 100755
--- a/alsatool
+++ b/alsatool
@@ -732,8 +732,8 @@ def kmirrorpick(argv, edit=True, sign=False, interactive=True):
 		os.mkdir(tmpdir)
 	if os.system("git --work-tree=%s --git-dir=%s format-patch -k --stdout --full-index --committer %s~1..%s > %s" % (repo, repo + '/.git', commit, commit, tmpdir + '/format-patch')):
 		raise ValueError, "format-patch"
-	lines = open(tmpdir + "/format-patch").readlines()
-	open(tmpdir + "/format-patch", "w+").write(''.join(lines))
+	#lines = open(tmpdir + "/format-patch").readlines()
+	#open(tmpdir + "/format-patch", "w+").write(''.join(newlines))
 	if edit:
 		editor = os.environ.has_key('EDITOR') and os.environ['EDITOR'] or 'vi'
 		copyfile(tmpdir + "/format-patch", tmpdir + "/format-patch.orig")
@@ -741,9 +741,18 @@ def kmirrorpick(argv, edit=True, sign=False, interactive=True):
 		if not os.system("diff %s %s > /dev/null" % (tmpdir + "/format-patch", tmpdir + "/format-patch.orig")):
 			return "nochanges"
 	res = os.system("git am%s%s -3 --keep %s" % (sign, interactive, tmpdir + '/format-patch'))
+	if res == 256:
+	  res = os.system("LANG=C patch -p2 < %s > %s" % (tmpdir + '/format-patch', tmpdir + '/patch.out'))
+          lines = open(tmpdir + '/patch.out').readlines()
+          sys.stdout.write(''.join(lines))
+	  if res == 0:
+	    for line in lines:
+	      if line.startswith('patching file '):
+	        os.system("git add %s" % line[13:])
+	    os.system("git am -3 --resolved")
 	#if os.system("git --work-tree=%s --git-dir=%s mailinfo -u %s %s < %s > %s" % (repo, repo + '/.git', tmpdir + '/msg', tmpdir + '/patch', tmpdir + '/format-patch', tmpdir + '/info')):
 	#	raise ValueError, "mail-info"
-	rmtree(tmpdir)
+	#rmtree(tmpdir)
 	return res
 
 def edit(argv, remove=False):
diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive
index ed6898b..1330802 100755
--- a/hooks/alsa-kernel.git/pre-receive
+++ b/hooks/alsa-kernel.git/pre-receive
@@ -391,7 +391,7 @@ def compare_trees(lastref):
     for i in ['oss', 'pci/ac97/ak4531_codec.c', 'isa/sb/sb16_csp_codecs.h',
     	      'pci/korg1212/korg1212-firmware.h', 'pci/ymfpci/ymfpci_image.h',
     	      'pci/hda/hda_patch.h',
-    	      'isa/ad1848/ad1848_lib.c', 'isa/cs423x/cs4231_lib.c',
+    	      'isa/ad1848/ad1848_lib.c', 'isa/cs423x/cs4231_lib.c', 'isa/cs423x/cs4232.c',
     	      'include/cs4231.h', 'soc/at91/eti_b1_wm8731.c',
     	      'aoa/codecs/snd-aoa-codec-onyx.c', 'aoa/codecs/snd-aoa-codec-onyx.h',
     	      'aoa/codecs/snd-aoa-codec-tas-basstreble.h', 'aoa/codecs/snd-aoa-codec-tas-gain-table.h',
-- 
2.47.1