continue

Author: host6

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

@@ -326,15 +326,8 @@ void checkout(Git git, Repository gitRepo, String branchName) throws Exception {
 				.pull()
 				.setCredentialsProvider(credentials)
 				.call();
-		CheckoutCommand cmd = git
-				.checkout();
-		Ref ref = gitRepo.exactRef("refs/heads/" + bn);
-		if (ref == null) {
-			cmd = cmd
-					.setCreateBranch(true)
-					.setStartPoint("origin/" + bn);
-		}
-		cmd
+		git
+				.checkout()
 				.setName(bn)
 				.call();
 	}
@@ -688,18 +681,22 @@ public List<VCSTag> getTags() {
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
-       
 	}
 
 	List<Ref> getTagRefs() throws Exception {
-		return new ArrayList<>(Git
-				.lsRemoteRepository()
-				.setTags(true)
-				.setHeads(false)
-				.setRemote(repo.getRepoUrl())
-				.setCredentialsProvider(credentials)
-				.call());
+		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
+			 Git git = getLocalGit(wc);
+			 Repository gitRepo = git.getRepository()) {
+
+			checkout(git, gitRepo, MASTER_BRANCH_NAME);
+
+			List<Ref> refs = git
+					.tagList()
+					.call();
+
+			return refs;
 		}
+	}
 
 	@Override
 	public VCSTag getLastTag() {
@@ -719,11 +716,12 @@ public VCSTag getLastTag() {
 
 			Collections.sort(tagRefs, new Comparator<Ref>() {
 				public int compare(Ref o1, Ref o2) {
-					try {
+					try (Repository gitRepo = git.getRepository();
+						 RevWalk rw = new RevWalk(gitRepo)) { // for exception rethrow test only
 						Date d1 = rw.parseTag(o1.getObjectId()).getTaggerIdent().getWhen();
 						Date d2 = rw.parseTag(o2.getObjectId()).getTaggerIdent().getWhen();
 						return d1.compareTo(d2);
-					} catch (IOException e) {
+					} catch (Exception e) {
 						throw new RuntimeException(e);
 					}
 				}
@@ -757,8 +755,8 @@ public void removeTag(String tagName) {
 					.tagDelete()
 					.setTags(tagName)
 					.call();
-			
-			push(git, null);
+
+			push(git, new RefSpec(":refs/tags/" + tagName));
 
 		} catch (GitAPIException e) {
 			throw new EVCSException(e);

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

@@ -27,6 +27,7 @@
 import java.net.*;
 import java.nio.charset.IllegalCharsetNameException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.*;
@@ -260,6 +261,21 @@ public void testGetLastTagEmptyTagRefsList() throws Exception {
 		Mockito.doReturn(new ArrayList<Ref>()).when(git).getTagRefs();
 		assertNull(vcs.getLastTag());
 	}
+
+	@Test
+	public void testGetLastTagSortingFailed() throws Exception {
+		vcs.createTag(null, TAG_NAME_1, TAG_MESSAGE_1);
+		Ref ref1 = Mockito.mock(Ref.class);
+		Ref ref2 = Mockito.mock(Ref.class);
+		List<Ref> refs = Arrays.asList(ref1, ref2);
+		Mockito.doReturn(refs).when(git).getTagRefs();
+		try {
+			vcs.getLastTag();
+			fail();
+		} catch (RuntimeException e) {
+			assertTrue(e.getCause().getCause() instanceof NullPointerException);
+		}
+	}
 
 	@Test
 	public void testGetLastTagUnannotatedTag() throws Exception {