Thread (7 messages) flat view 7 messages, 2 authors, 2016-06-15

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

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:46:16

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.
...
quoted hunk ↗ jump to hunk
@@ -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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help