| commit | 86cc51b4d50b33fd6caf8dd1c9f6daa32b14a761 | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Fri, 12 Aug 2016 21:46:04 +0000 (12 23:46 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Thu, 20 Oct 2016 20:22:56 +0000 (20 22:22 +0200) | ||
| tree | e6c57784676dcdb0cff99554b1d55b02ebcf8d70 | treesnapshot (tar.gz zip) |
| parent | a5209fccadb30ea2e20a67b30d2949eabb8ab918 | commitdiff |
Handle rebase modes 'preserve' and 'interactive' in EGit
EGit and JGit treated branch.<name>.rebase as a boolean config value,
which is wrong: git actually also allows 'preserve' and 'interactive'.
Since commit aadbb158 in JGit, JGit does recognize these extra values.
Adapt the EGit UI (wizards & dialogs for branch creation, branch
configuration, pulling and pushing a branch) to provide a UI to let
the user select any valid BranchRebaseMode value. Introduce a new
BranchRebaseModeCombo for this.
Adapt UI tests.
Honor the setting in all relevant operations in EGit.
Note that JGit currently ignores the "interactive" setting in a
PullCommand and performs a normal rebase instead.
Bug: 499482
Change-Id: I0a3b639bbb9e5dd5d93134587410ba72c0549cc7
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
EGit and JGit treated branch.<name>.rebase as a boolean config value,
which is wrong: git actually also allows 'preserve' and 'interactive'.
Since commit aadbb158 in JGit, JGit does recognize these extra values.
Adapt the EGit UI (wizards & dialogs for branch creation, branch
configuration, pulling and pushing a branch) to provide a UI to let
the user select any valid BranchRebaseMode value. Introduce a new
BranchRebaseModeCombo for this.
Adapt UI tests.
Honor the setting in all relevant operations in EGit.
Note that JGit currently ignores the "interactive" setting in a
PullCommand and performs a normal rebase instead.
Bug: 499482
Change-Id: I0a3b639bbb9e5dd5d93134587410ba72c0549cc7
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
19 files changed: