Re: [EGIT] [PATCH 2/2] Make sure to set up the default (pull) remote branch for master

From: Shawn O. Pearce <spearce@spearce.org>
Date: Feb 23, 2009, 16:09 UTC
Message-ID: <20090223160957.GK22848@spearce.org>
In-Reply-To: <e26eb3c2a7a0ce2b96252f00c17a62913d741579.1235228532.git.ferry.huberts@pelagic.nl>

ferry.huberts@pelagic.nl wrote:

> This is to make sure that the git plugin sets up a clone
> in the same fashion as the CLI git clone command.

...

Show 8 quoted lines

> @@ -158,6 +159,11 @@ private void doInit(final IProgressMonitor monitor)
>  		local.getConfig().setBoolean("core", null, "bare", false);
>  		
>  		remoteConfig.update(local.getConfig());
> +
> +		/* setup the default (pull) remote branch for master */
> +		local.getConfig().setString(RepositoryConfig.BRANCH_SECTION, Constants.MASTER, "remote", remoteName);
> +		local.getConfig().setString(RepositoryConfig.BRANCH_SECTION, Constants.MASTER, "merge", Constants.R_HEADS + Constants.MASTER);

Shouldn't this be "branch" and not "Constants.MASTER" ?

IIRC the dialog lets you start off a branch that isn't "master", especially if the remote repository has no branch named "master" but has something else that HEAD points at. "git clone" would setup this branch.${branch}.merge to point at what the upstream branch calls itself.

-- 
Shawn.