From 60183b92d108790e1c8c83d884758339ae497b35 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 8 Apr 2009 11:07:35 +0200 Subject: [PATCH] Add ASoC: to prereceive --- alsatool | 7 +++++-- hooks/alsa-kernel.git/pre-receive | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/alsatool b/alsatool index 69c2925..ea65353 100755 --- a/alsatool +++ b/alsatool @@ -979,6 +979,9 @@ def kmirrorcheck(argv): return str.strip() full = argv and argv[0] == 'full' + fromrev = 'linux-2.6' + if argv and len(argv) > 1: + fromrev = argv[1] print("Analyzing git-ok-commits..") git_ok_commits = read_git_ok_commits() @@ -994,7 +997,7 @@ def kmirrorcheck(argv): os.chdir(ROOT + '/alsa-kernel') if full: - log1 = os.popen("git log --reverse --name-only --pretty=oneline --date=iso linux-2.6..master") + log1 = os.popen("git log --reverse --name-only --pretty=oneline --date=iso %s..master" % fromrev) else: print("Looking for a common base...") base = os.popen("git merge-base %s linux-2.6" % getorigin()).read(1024).strip() @@ -1129,7 +1132,7 @@ The following files will be updated: print(lines) def kimport(argv=None): - repos = argv and {} or {'tiwai':'master'} + #repos = argv and {} or {'tiwai':'master'} if argv: for i in argv: a, b = i.split(i.find(':') > 0 and ':' or '/') diff --git a/hooks/alsa-kernel.git/pre-receive b/hooks/alsa-kernel.git/pre-receive index 8c57225..58399b2 100755 --- a/hooks/alsa-kernel.git/pre-receive +++ b/hooks/alsa-kernel.git/pre-receive @@ -330,6 +330,7 @@ def do_check_commit(lines): # exit(1) if not lines[6][4:].upper().startswith('[ALSA] ') and \ not lines[6][4:].upper().startswith('ALSA: ') and \ + not lines[6][4:].upper().startswith('ASoC: ') and \ not lines[6][4:].upper().startswith('[SOUND] ') and \ not lines[6][4:].upper().startswith('SOUND: '): error(lines, 'First log line does not start with "[ALSA] " or "ALSA: " or "[SOUND] " or "SOUND: "\n') -- 2.47.1