Determine rebase from global setting, if it is not configured for branch

bit3archive · May 21, 2017 · 5d71e17 · 5d71e17
1 parent 586c093
commit 5d71e17
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/io/bit3/mgpm/worker/Worker.java b/src/main/java/io/bit3/mgpm/worker/Worker.java
@@ -307,6 +307,11 @@ private void determineLocalBranchesAndUpstreams() throws GitProcessException {
 
       try {
         rebase = git("config", "--local", "--get", String.format("branch.%s.rebase", branchName)).toLowerCase();
+
+        if (StringUtils.isBlank(rebase)) {
+          // not defined for this branch, use global setting instead
+          rebase = git("config", "--get", "pull.rebase");
+        }
       } catch (GitProcessException e) {
         // exception means, there is no remote configured
       }