EVCSBranchNotFound.java added

EVCSBranchNotFound throwing added in getFileContent

Author: host6

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

@@ -0,0 +1,13 @@
+package org.scm4j.vcs;
+
+import org.scm4j.vcs.api.exceptions.EVCSException;
+
+public class EVCSBranchNotFound extends EVCSException {
+	
+	private static final long serialVersionUID = 1L;
+
+	public EVCSBranchNotFound(String repoUrl, String branchName) {
+		super(String.format("branch %s is not found in repo %s", branchName, repoUrl));
+	}
+
+}

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

@@ -298,8 +298,11 @@ public String getFileContent(String branchName, String fileRelativePath, String
 					.setCredentialsProvider(credentials)
 					.call();
 			git.pull().call(); //TODO: add test when we receive correct file version if we change it from another LWC
-			
 			ObjectId revisionCommitId = gitRepo.resolve(revision == null ? "refs/heads/" + getRealBranchName(branchName)  : revision);
+			if (revision == null && revisionCommitId == null) {
+				throw new EVCSBranchNotFound(getRepoUrl(), getRealBranchName(branchName)); 
+			}
+			
 			RevCommit commit = revWalk.parseCommit(revisionCommitId);
 			RevTree tree = commit.getTree();
 			treeWalk.addTree(tree);