From ab9f02193188af8e482052ee6b55c30aac2c8340 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 17 Feb 2014 09:15:30 +0100 Subject: script/autobuild: use --force-rebase option This makes sure the current user will be the committer. Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- script/autobuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index 4fd6ee45e20..afd8d3d2547 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -413,11 +413,11 @@ def rebase_tree(rebase_url, rebase_branch = "master"): show=True, dir=test_master) run_cmd("git fetch %s" % rebase_remote, show=True, dir=test_master) if options.fix_whitespace: - run_cmd("git rebase --whitespace=fix %s/%s" % + run_cmd("git rebase --force-rebase --whitespace=fix %s/%s" % (rebase_remote, rebase_branch), show=True, dir=test_master) else: - run_cmd("git rebase %s/%s" % + run_cmd("git rebase --force-rebase %s/%s" % (rebase_remote, rebase_branch), show=True, dir=test_master) diff = run_cmd("git --no-pager diff HEAD %s/%s" % -- cgit