checkout fix

Author: host6

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -260,12 +260,12 @@ private File getFileFromRepo(String branchName, String fileRelativePath) {
 
 			checkout(git, gitRepo, branchName);
 
-				return new File(wc.getFolder(), fileRelativePath);
-			} catch (GitAPIException e) {
-				throw new EVCSException(e);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
+			return new File(wc.getFolder(), fileRelativePath);
+		} catch (GitAPIException e) {
+			throw new EVCSException(e);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	@Override
@@ -328,6 +328,9 @@ void checkout(Git git, Repository gitRepo, String branchName) throws Exception {
 				.call();
 		git
 				.checkout()
+				.setStartPoint("origin/" + bn)
+				.setCreateBranch(gitRepo.exactRef("refs/heads/" + bn) == null)
+				.setUpstreamMode(SetupUpstreamMode.TRACK)
 				.setName(bn)
 				.call();
 	}