Merge remote-tracking branch 'origin/master' into 1.2.1-RC1

common-workflow-language · Aug 22, 2017 · ac130db · ac130db
2 parents c448d6e + 72d39b9
commit ac130db
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/org/commonwl/view/git/GitService.java b/src/main/java/org/commonwl/view/git/GitService.java
@@ -19,16 +19,6 @@
 
 package org.commonwl.view.git;
 
-import static org.apache.jena.ext.com.google.common.io.Files.createTempDir;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.commonwl.view.researchobject.HashableAgent;
 import org.eclipse.jgit.api.Git;
@@ -43,6 +33,16 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.apache.jena.ext.com.google.common.io.Files.createTempDir;
+
 /**
  * Handles Git related functionality
  */
@@ -82,6 +82,7 @@ public Git getRepository(GitDetails gitDetails, boolean reuseDir)
                     // Check if folder already exists
                     Path repoDir = gitStorage.resolve(baseName);
                     if (Files.isReadable(repoDir) && Files.isDirectory(repoDir)) {
+                        repo = Git.open(repoDir.toFile());
                         repo.fetch().call();
                     } else {
                         // Create a folder and clone repository into it

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -53,7 +53,7 @@ <h2>Workflow URL</h2>
                         <strong>Don't know what to view?</strong> Try these from <i>common-workflow-language/workflows</i>:
                         <a class="example" href="https://github.com/common-workflow-language/workflows/tree/master/workflows/compile/compile1.cwl">compile</a>,
                         <a class="example" href="https://github.com/common-workflow-language/workflows/tree/master/workflows/make-to-cwl/dna.cwl">make-to-cwl</a>,
-                        <a class="example" href="https://github.com/common-workflow-language/workflows/tree/master/workflows/lobSTR/lobSTR-workflow.cwl">lobSTR</a>
+                        <a class="example" href="https://github.com/common-workflow-language/workflows/tree/lobstr-v1/workflows/lobSTR/lobSTR-workflow.cwl">lobSTR</a>
                         or <a href="/workflows">explore the collection</a>
                     </div>
                     <form id="add" action="#" th:action="@{/workflows}" th:object="${workflowForm}" method="POST">