Add config option for git-sync --pull

openjdk · Nov 20, 2019 · ae8a592 · ae8a592
1 parent 2881d91
commit ae8a592
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cli/src/main/java/org/openjdk/skara/cli/GitSync.java b/cli/src/main/java/org/openjdk/skara/cli/GitSync.java
@@ -155,7 +155,12 @@ public static void main(String[] args) throws IOException, InterruptedException
             System.out.println("done");
         }
 
-        if (arguments.contains("pull")) {
+        var shouldPull = arguments.contains("pull");
+        if (!shouldPull) {
+            var lines = repo.config("sync.pull");
+            shouldPull = lines.size() == 1 && lines.get(0).toLowerCase().equals("always");
+        }
+        if (shouldPull) {
             int err = pull();
             if (err != 0) {
                 System.exit(err);