Description Abdullah Asif 2013-02-10 19:43:51 EST

CreateBranchCommand does not support tracking remotes with "/" character in it.

Step 1) Configure a remote, "github/asif"

Step 2) Fetch branches from the remote, "github/asif"

Step 3) Create Branch with starting point (or tracked to) "github/asif/master"

CreateBranchCommand will create local branch "master" as follows,

[branch "master"]
    remote = github
    merge = refs/heads/asif/master

It should have been remote = github/asif. Btw, jGit as well as git cli allows creating remote with / characters in the name.

After doing a bit of debugging, following snippet in class CreateBranchCommand causes the issue; It blindly tokenizes based of "/" which is not very clever as it breaks when remote name has "/" character.

String[] tokens = baseBranch.split("/", 4);
boolean isRemote = tokens[1].equals("remotes");
if (isRemote) {
	// refs/remotes/<remote name>/<branch>
	String remoteName = tokens[2];
	String branchName = tokens[3];
	config
			.setString(ConfigConstants.CONFIG_BRANCH_SECTION,
					name, ConfigConstants.CONFIG_KEY_REMOTE,
					remoteName);
	config.setString(ConfigConstants.CONFIG_BRANCH_SECTION,
			name, ConfigConstants.CONFIG_KEY_MERGE,
			Constants.R_HEADS + branchName);
}