From 4b66c0c32812a63958b26fb54c31248758c38aa2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 18 Jan 2010 17:41:58 +0100 Subject: [PATCH] alsatool kmerge: push back results to origin Signed-off-by: Jaroslav Kysela --- alsatool | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/alsatool b/alsatool index f8549bf..9cdc074 100755 --- a/alsatool +++ b/alsatool @@ -1033,6 +1033,7 @@ def kmerge(argv=''): os.chdir(config.ROOT + '/alsa-kernel') git0 = 'git ' checkout = False + changes = 0 for url, branch, lbranch, web in config.GIT_MERGE_REPOS: lbranch = 'alsamerge/' + lbranch ref = getgitfile(web, 'refs/heads/' + branch) @@ -1056,6 +1057,12 @@ def kmerge(argv=''): raise ValueError, ' pull ' + url + ' ' + branch if os.system(git0 + ' branch -f ' + lbranch + ' ' + ref): raise ValueError, ' branch ' + lbranch + ' ' + ref + if os.system(git0 + ' push -f origin ' + lbranch): + raise ValueError, ' push -f origin ' + lbranch + changes += 1 + if changes > 0: + if os.system(git0 + ' push -f origin alsamerge/master'): + raise ValueError, ' push -f origin alsamerge/master' def background(argv=''): global BACKGROUND -- 2.47.1