fixed getHeadRevCommit()

Author: host6

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

@@ -345,12 +345,12 @@ public VCSCommit setFileContent(String branchName, String filePath, String conte
 			 Git git = getLocalGit(wc);
 			 Repository gitRepo = git.getRepository()) {
 			String bn = getRealBranchName(branchName);
-
+			
 			git
 					.pull()
 					.setCredentialsProvider(credentials)
 					.call();
-
+			
 			git
 					.checkout()
 					.setCreateBranch(gitRepo.exactRef("refs/heads/" + bn) == null)
@@ -485,7 +485,7 @@ public List<String> getCommitMessages(String branchName, Integer limit) {
 
 			Iterable<RevCommit> logs = git
 					.log()
-					.add(gitRepo.resolve("remotes/origin/" + getRealBranchName(branchName)))
+					.add(gitRepo.resolve("refs/remotes/origin/" + getRealBranchName(branchName)))
 					.setMaxCount(limit)
 					.call();
 
@@ -513,6 +513,7 @@ public VCSCommit removeFile(String branchName, String filePath, String commitMes
 			 Repository gitRepo = git.getRepository()) {
 
 			String bn = getRealBranchName(branchName);
+			
 			git
 					.pull()
 					.setCredentialsProvider(credentials)
@@ -678,12 +679,8 @@ private RevCommit getHeadRevCommit (String branchName) {
 			 RevWalk rw = new RevWalk(gitRepo)) {
 
 			String bn = getRealBranchName(branchName);
-			git
-					.checkout()
-					.setCreateBranch(gitRepo.exactRef("refs/heads/" + bn) == null)
-					.setName(bn)
-					.call();
-			Ref ref = gitRepo.exactRef("refs/heads/" + bn);
+			
+			Ref ref = gitRepo.exactRef("refs/remotes/origin/" + bn);
 			ObjectId commitId = ref.getObjectId();
 			return rw.parseCommit( commitId );
 		} catch (GitAPIException e) {
@@ -763,7 +760,18 @@ public List<VCSTag> getTags() {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
 			 Git git = getLocalGit(wc);
 			 Repository gitRepo = git.getRepository();
-			 RevWalk rw = new RevWalk(gitRepo)	) {
+			 RevWalk rw = new RevWalk(gitRepo)) {
+			git
+					.checkout()
+					.setCreateBranch(gitRepo.exactRef("refs/heads/" + MASTER_BRANCH_NAME) == null)
+					.setName(MASTER_BRANCH_NAME)
+					.call();
+			
+			git
+					.pull()
+					.setCredentialsProvider(credentials)
+					.call();
+			
             List<Ref> refs = git
             		.tagList()
             		.call();

src/test/java/org/scm4j/vcs/GitVCSTest.java

@@ -1,5 +1,25 @@
 package org.scm4j.vcs;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.Authenticator;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.IllegalCharsetNameException;
+import java.util.List;
+
 import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -15,16 +35,6 @@
 import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
 import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.*;
-import java.nio.charset.IllegalCharsetNameException;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
 public class GitVCSTest extends VCSAbstractTest {
 
 	private Repository localGitRepo;
@@ -36,10 +46,6 @@ public void setUp() throws Exception {
 		super.setUp();
 		Git git = GitVCSUtils.createRepository(new File(localVCSWorkspace.getHomeFolder(), repoName));
 		localGitRepo = git.getRepository();
-		git
-				.commit()
-				.setMessage("Initial commit")
-				.call();
 		proxySelectorBackup = ProxySelector.getDefault();
 		ProxySelector.setDefault(null);
 	}