]> source.dussan.org Git - jgit.git/commit
Handle all values of branch.[name].rebase 31/79031/3
authorThomas Wolf <thomas.wolf@paranor.ch>
Mon, 15 Aug 2016 05:55:44 +0000 (07:55 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 14 Sep 2016 22:44:23 +0000 (00:44 +0200)
commitaadbb158e10ccc3194c4e7f2c1b3885b3c40571c
tree99e91dafc7ebf198edb87c5754406ca48b7da172
parent619329c84e41f9abe83616795d65af8c7fed5f3d
Handle all values of branch.[name].rebase

BranchConfig treated this config property as a boolean, but git also
allows the values "preserve" and "interactive". Config property
pull.rebase also allows the same values.

Replace private enum PullCommand.PullRebaseMode by new public enum
BranchConfig.BranchRebaseMode and adapt all uses. Add a new setter to
PullCommand.

Note: PullCommand will treat "interactive" like "true", i.e., as a
non-interactive rebase. Not sure how "interactive" should be handled.
At least it won't balk on it.

Bug: 499482
Change-Id: I7309360f5662b2c2efa1bd8ea6f112c63cf064af
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java
org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java