fix #11

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

Author: dvojtise

sync-git-submodules-branches/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.gemoc.git-sync-tools</groupId>
 	<artifactId>sync-git-submodules-branches-plugin</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>sync-git-submodules-branches Maven Plugin</name>

sync-git-submodules-branches/src/main/java/org/gemoc/sync_git_submodules_branches/gittool/GitModuleManager.java

@@ -286,8 +286,8 @@ public void deleteBranchesNotIn(Set<String> relevantBranches) throws Exception {
 			try (Git parentgit = new Git(parentRepository)) {
 				List<Ref> call = parentgit.branchList().setListMode(ListMode.REMOTE).call();
 				for (Ref ref : call) {
-					if (ref.getName().startsWith("refs/remotes")) {
-						String branchName = ref.getName().substring(ref.getName().lastIndexOf("/") + 1);
+					if (ref.getName().startsWith("refs/remotes/origin/")) {
+						String branchName = ref.getName().substring("refs/remotes/origin/".length());
 						if (!relevantBranches.contains(branchName) && !branchName.equals(masterBranchName)) {
 							logger.info("Pushing deletion of branch " + ref.getName() );
 							// delete locally
@@ -326,8 +326,8 @@ public void createMissingParentBranches(Set<String> relevantBranches)
 			try (Git parentgit = new Git(parentRepository)) {
 				List<Ref> call = parentgit.branchList().setListMode(ListMode.REMOTE).call();
 				for (Ref ref : call) {
-					if (ref.getName().startsWith("refs/remotes")) {
-						String branchName = ref.getName().substring(ref.getName().lastIndexOf("/") + 1);
+					if (ref.getName().startsWith("refs/remotes/origin/")) {
+						String branchName = ref.getName().substring("refs/remotes/origin/".length());
 						parentBranches.add(branchName);
 					}
 				}
@@ -392,9 +392,9 @@ public void updateAllBranchesModules() throws IOException, GitAPIException, GitS
 			try (Git parentgit = new Git(parentRepository)) {
 				List<Ref> call = parentgit.branchList().setListMode(ListMode.REMOTE).call();
 				for (Ref ref : call) {
-					if (ref.getName().startsWith("refs/remotes")) {
+					if (ref.getName().startsWith("refs/remotes/origin/")) {
 						updateBranchesForModules(parentgit,
-								ref.getName().substring(ref.getName().lastIndexOf("/") + 1));
+								ref.getName().substring("refs/remotes/origin/".length()));
 					}
 				}
 			}
@@ -428,8 +428,8 @@ public void updateBranchesForModules(Git parentgit, String consideredBranch)
 					Ref trackedBranchRef = null;
 					List<Ref> branches = submodulegit.branchList().setListMode(ListMode.REMOTE).call();
 					for (Ref ref : branches) {
-						if (ref.getName().startsWith("refs/remotes")) {
-							String branchName = ref.getName().substring(ref.getName().lastIndexOf("/") + 1);
+						if (ref.getName().startsWith("refs/remotes/origin/")) {
+							String branchName = ref.getName().substring("refs/remotes/origin/".length());
 							if (branchName.equals(consideredBranch)) {
 								trackedBranchName = consideredBranch;
 								trackedBranchRef = ref;
@@ -548,8 +548,8 @@ public void checkoutBranch(Git git, String branchName) throws GitAPIException, G
 		// else look for a remote branch with this name
 		List<Ref> call = git.branchList().setListMode(ListMode.REMOTE).call();
 		for (Ref ref : call) {
-			if (ref.getName().startsWith("refs/remotes")) {
-				String remotebranchName = ref.getName().substring(ref.getName().lastIndexOf("/") + 1);
+			if (ref.getName().startsWith("refs/remotes/origin/")) {
+				String remotebranchName = ref.getName().substring("refs/remotes/origin/".length());
 				if (branchName.equals(remotebranchName)) {
 					git.checkout()
 						.setName(branchName)