Add isRebase to API of BranchConfig

Change-Id: I9819f49410e30d32c2157db0556a0dd6a0bcc5a4
Signed-off-by: Robin Stocker <robin@nibor.org>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java
index 63441bfe9032976c18006fafad4206b3f2929d2d..87bb0824856bc733815947287b5ba4a73ecb99f1 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java
@@ -45,7 +45,9 @@
 package org.eclipse.jgit.lib;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.junit.Test;
@@ -144,6 +146,20 @@ public class BranchConfigTest {
                                branchConfig.getTrackingBranch());
        }
 
+       @Test
+       public void isRebase() {
+               Config c = parse("" //
+                               + "[branch \"undefined\"]\n"
+                               + "[branch \"false\"]\n"
+                               + "  rebase = false\n"
+                               + "[branch \"true\"]\n"
+                               + "  rebase = true\n");
+
+               assertFalse(new BranchConfig(c, "undefined").isRebase());
+               assertFalse(new BranchConfig(c, "false").isRebase());
+               assertTrue(new BranchConfig(c, "true").isRebase());
+       }
+
        private static Config parse(final String content) {
                final Config c = new Config(null);
                try {

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java
index 3a2c54485d0c820eb83df8debacbbcb556548e79..a62f6c3b5d4184914d98b5a513348590136eec23 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java
@@ -134,9 +134,17 @@ public class BranchConfig {
         * @since 3.5
         */
        public String getMerge() {
-               return config.getString(
-                               ConfigConstants.CONFIG_BRANCH_SECTION, branchName,
-                               ConfigConstants.CONFIG_KEY_MERGE);
+               return config.getString(ConfigConstants.CONFIG_BRANCH_SECTION,
+                               branchName, ConfigConstants.CONFIG_KEY_MERGE);
+       }
+
+       /**
+        * @return {@code true} if the branch is configured to be rebased
+        * @since 3.5
+        */
+       public boolean isRebase() {
+               return config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
+                               branchName, ConfigConstants.CONFIG_KEY_REBASE, false);
        }
 
        /**