opendev/git-review
Code Issues Proposed changes
5bfaa4a6f3
git-review/git_review/tests
History
Pierre Riteau 7182166ec0 Fix use of removed --preserve-merges option 
The --preserve-merges (-p) option was replaced by --rebase-merges (-r).
This fixes the following error when using git version 2.34.0:

    Errors running git rebase -p -i remotes/gerrit/stable/xena
    fatal: --preserve-merges was replaced by --rebase-merges

In order to keep compatibility with git < 2.18.0 we detect the git
version and use the old --preserve-merges flag when the version is older
than 2.18.0.

Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
Change-Id: I04de3d0f20aa6bafcf746b7706d61dd9b9af296c
2021-11-19 08:25:34 -08:00
..
__init__.py Ignore unstaged/uncommitted submodule changes 2021-07-07 16:08:06 +00:00
check_test_id_hashes.py trivial: Update to hacking 2.x 2020-01-16 15:12:58 +00:00
prepare.py trivial: Update to hacking 2.x 2020-01-16 15:12:58 +00:00
test_git_review.py Fix use of removed --preserve-merges option 2021-11-19 08:25:34 -08:00
test_unit.py Overhaul Python package metadata and OpenDev URLs 2021-02-26 20:45:24 +00:00
utils.py trivial: Update to hacking 2.x 2020-01-16 15:12:58 +00:00