diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-17 09:15:30 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-03-13 21:45:12 +0100 |
| commit | ab9f02193188af8e482052ee6b55c30aac2c8340 (patch) | |
| tree | 48eadad4c07241f69e49c0b8af468a57dd544e59 /script | |
| parent | f164e81e8b268ccab6c51c966b569dd06106caa2 (diff) | |
| download | samba-ab9f02193188af8e482052ee6b55c30aac2c8340.tar.gz samba-ab9f02193188af8e482052ee6b55c30aac2c8340.tar.xz samba-ab9f02193188af8e482052ee6b55c30aac2c8340.zip | |
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>
Diffstat (limited to 'script')
| -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 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" % |