diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-17 09:15:30 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-15 12:46:12 +0200 |
| commit | 2354597e4ec683800399137450932219663bf6d6 (patch) | |
| tree | 53f9fe2cf429f8470d35404a4ac62451113c4a98 | |
| parent | 50af515fb023dfca5a2b11ea2e19b08c962d833d (diff) | |
| download | samba-2354597e4ec683800399137450932219663bf6d6.tar.gz | |
script/autobuild: use --force-rebase option
This makes sure the current user will be the committer.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit ab9f02193188af8e482052ee6b55c30aac2c8340)
| -rwxr-xr-x | script/autobuild.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index b5f054b6fc..315ba3fabd 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -397,11 +397,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" % |