fixed working with tags.

Author: host6

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

@@ -729,7 +729,9 @@ public VCSTag createTag(String branchName, String tagName, String tagMessage, St
 			 Repository gitRepo = git.getRepository();
 			 RevWalk rw = new RevWalk(gitRepo)) {
 
-			checkout(git, gitRepo, branchName, null);
+			git
+					.pull()
+					.call();
 
 			RevCommit commitToTag = revisionToTag == null ? null : rw.parseCommit(ObjectId.fromString(revisionToTag));
 
@@ -763,9 +765,7 @@ public List<VCSTag> getTags() {
 			 Repository gitRepo = git.getRepository();
 			 RevWalk rw = new RevWalk(gitRepo)) {
 
-			git.pull().call();
-			
-			List<Ref> tagRefs = getTagRefs();
+			List<Ref> tagRefs = getTagRefs(git);
 	        List<VCSTag> res = new ArrayList<>();
 	        RevCommit revCommit;
 	        for (Ref ref : tagRefs) {
@@ -778,6 +778,7 @@ public List<VCSTag> getTags() {
 	        		RevTag revTag = (RevTag) revObject;
 	        		tag = new VCSTag(revTag.getTagName(), revTag.getFullMessage(), revTag.getTaggerIdent().getName(), relatedCommit);
 	        	} else  {
+	        		// tag is unannotated
 	        		tag = new VCSTag(ref.getName().replace("refs/tags/", ""), null, null, relatedCommit);
 	        	}
 	        	res.add(tag);
@@ -788,19 +789,17 @@ public List<VCSTag> getTags() {
 		}
 	}
 
-	List<Ref> getTagRefs() throws Exception {
-		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
-			 Git git = getLocalGit(wc);
-			 Repository gitRepo = git.getRepository()) {
-
-			git.pull().call();
-			
-			List<Ref> refs = git
-					.tagList()
-					.call();
-
-			return refs;
-		}
+	private List<Ref> getTagRefs(Git git) throws Exception {
+		// need to remove tags from local repo which are removed in origin
+		git
+				.fetch()
+				.setRefSpecs(new RefSpec("+refs/tags/*:refs/tags/*"))
+				.setRemoveDeletedRefs(true)
+				.setCredentialsProvider(credentials)
+				.call();
+		return git
+				.tagList()
+				.call();
 	}
 
 	@Override
@@ -810,15 +809,16 @@ public void removeTag(String tagName) {
 			 Repository gitRepo = git.getRepository();
 			 RevWalk rw = new RevWalk(gitRepo)) {
 
-			checkout(git, gitRepo, MASTER_BRANCH_NAME, null);
-			
+			git.pull().call();
+
 			git
 					.tagDelete()
 					.setTags(tagName)
 					.call();
-
+		
 			push(git, new RefSpec(":refs/tags/" + tagName));
 
+			
 		} catch (GitAPIException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {
@@ -848,10 +848,8 @@ public List<VCSTag> getTagsOnRevision(String revision) {
 			 RevWalk rw = new RevWalk(gitRepo)) {
 
 			List<VCSTag> res = new ArrayList<>();
-				
-			git.pull().call();
 
-			List<Ref> tagRefs = getTagRefs();
+			List<Ref> tagRefs = getTagRefs(git);
 			RevCommit revCommit;
 			for (Ref ref : tagRefs) {
 				ObjectId relatedCommitObjectId = ref.getPeeledObjectId() == null ? ref.getObjectId() : ref.getPeeledObjectId();

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

@@ -39,7 +39,10 @@
 import org.scm4j.vcs.api.VCSTag;
 import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
 import org.scm4j.vcs.api.exceptions.EVCSException;
+import org.scm4j.vcs.api.workingcopy.IVCSLockedWorkingCopy;
 import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import org.scm4j.vcs.api.workingcopy.IVCSWorkspace;
+import org.scm4j.vcs.api.workingcopy.VCSWorkspace;
 
 public class GitVCSTest extends VCSAbstractTest {
 
@@ -67,7 +70,7 @@ public void tearDown() throws IOException {
 
 	@Override
 	protected String getTestRepoUrl() {
-		return ("file:///" + localVCSWorkspace.getHomeFolder() + "/").replace("\\", "/");
+		return localVCSWorkspace.getHomeFolder().toURI().toString();
 	}
 
 	@Override
@@ -254,7 +257,13 @@ public void testGitVCSUtilsCreation() {
 
 	@Test
 	public void testGetTagsUnannotated() throws Exception {
-		git.createUnannotatedTag(null, TAG_NAME_1, null);
+		// create tag in different working copy
+		try (IVCSLockedWorkingCopy lwc = localVCSRepo.getVCSLockedWorkingCopyTemp()) {
+			IVCSWorkspace tempWS = new VCSWorkspace(lwc.getFolder().toString());
+			IVCSRepositoryWorkspace tempRWS = tempWS.getVCSRepositoryWorkspace(vcs.getRepoUrl());
+			GitVCS tempVCS = new GitVCS(tempRWS);
+			tempVCS.createUnannotatedTag(null, TAG_NAME_1, null);
+		}
 		List<VCSTag> tags = vcs.getTags();
 		assertTrue(tags.size() == 1);
 		VCSTag tag = tags.get(0);