Commit ID checkout bug fix

MarkRobbo · MarkRobbo · commit e9592c62bc72 · 2017-07-31T10:50:25.000+01:00
diff --git a/src/main/java/org/commonwl/view/git/GitService.java b/src/main/java/org/commonwl/view/git/GitService.java
@@ -88,7 +88,8 @@ public Git getRepository(GitDetails gitDetails)
                 repo.checkout()
                         .setName(gitDetails.getBranch())
                         .call();
-                if (repo.getRepository().getFullBranch() != null) {
+                String branch = repo.getRepository().getFullBranch();
+                if (branch != null && !branch.startsWith(gitDetails.getBranch())) {
                     repo.pull().call();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ public Git getRepository(GitDetails gitDetails)`
`88`	`88`	`repo.checkout()`
`89`	`89`	`.setName(gitDetails.getBranch())`
`90`	`90`	`.call();`
`91`		`- if (repo.getRepository().getFullBranch() != null) {`
	`91`	`+ String branch = repo.getRepository().getFullBranch();`
	`92`	`+ if (branch != null && !branch.startsWith(gitDetails.getBranch())) {`
`92`	`93`	`repo.pull().call();`
`93`	`94`	`}`
`94`	`95`	`}`