Update 6 (minor fixes)

tgrothe · Nov 6, 2024 · 241ea8e · 241ea8e
1 parent cc845b8
commit 241ea8e
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -32,20 +32,18 @@ private static void linearize1(File repo, String main) throws IOException, Inter
     for (int i = 0; i < branches.size(); i++) {
       String b1 = branches.get(i);
       for (int j = i + 1; j < branches.size(); j++) {
-        if (i != j) {
-          String b2 = branches.get(j);
-          System.out.printf("Check %s and %s.%n", b1, b2);
-          boolean a =
-              "0".equals(exec(false, repo, "git", "merge-base", "--is-ancestor", b1, b2).get(0));
-          if (a) {
-            ancestorMap.put(new AbstractMap.SimpleEntry<>(b1, b2), true);
-            ancestorMap.put(new AbstractMap.SimpleEntry<>(b2, b1), false);
-          } else {
-            boolean b =
-                "0".equals(exec(false, repo, "git", "merge-base", "--is-ancestor", b2, b1).get(0));
-            ancestorMap.put(new AbstractMap.SimpleEntry<>(b1, b2), false);
-            ancestorMap.put(new AbstractMap.SimpleEntry<>(b2, b1), b);
-          }
+        String b2 = branches.get(j);
+        System.out.printf("Check %s and %s.%n", b1, b2);
+        boolean a =
+            "0".equals(exec(false, repo, "git", "merge-base", "--is-ancestor", b1, b2).get(0));
+        if (a) {
+          ancestorMap.put(new AbstractMap.SimpleEntry<>(b1, b2), true);
+          ancestorMap.put(new AbstractMap.SimpleEntry<>(b2, b1), false);
+        } else {
+          boolean b =
+              "0".equals(exec(false, repo, "git", "merge-base", "--is-ancestor", b2, b1).get(0));
+          ancestorMap.put(new AbstractMap.SimpleEntry<>(b1, b2), false);
+          ancestorMap.put(new AbstractMap.SimpleEntry<>(b2, b1), b);
         }
       }
     }
@@ -152,9 +150,16 @@ private static void linearize2(
     }
   }
 
+  private static final boolean shouldCmdWrappedToBash = true;
+
   private static List<String> exec(boolean exitIfNoSuccess, File wd, String... cmd)
       throws IOException, InterruptedException {
-    String[] newCmd = {"bash", "-c", String.join(" ", cmd)};
+    String[] newCmd;
+    if (shouldCmdWrappedToBash) {
+      newCmd = new String[] {"bash", "-c", String.join(" ", cmd)};
+    } else {
+      newCmd = cmd;
+    }
     ProcessBuilder builder = new ProcessBuilder(newCmd);
     builder.directory(wd);
     builder.redirectErrorStream(true);