3

I'm new to git and am wrapping my head around how I'm supposed to be using git and egit. From the egit tutorial, I have setup a respository on GitHub, pushed my Eclipse projects to the remote GitHub repository from my local workspace, I can push changes to GitHub, switch branches, see the updates on GitHub, etc. This all makes sense.

Looking at the Git Repository explorer, I have a listing of "Local" branches and have no "Remote Tracking" branches and I have no "Remotes" listed. When I create a branch from a local branch, the egit dialog indicates "You are creating a branch based on a local branch" and suggests that I should be making a branch from a remote tracking branch.

So my question is, am I correctly using egit?

Should I just continue pushing changes to the remote GitHub repository? If so, what happens once I share the project and other developers clone the repository and start making changes to the remote repository?

Or should I now ditch the local repository and setup a new remote repository by cloning the existing GitHub repository that I initially created from my workspace?

Or do I create a new Push and Fetch "Remote" for my existing git repository?

Or something else?

Confused.

David
  • 699
  • 7
  • 18

2 Answers2

4

Since you created the repo on your local system and then pushed it to github without creating a remote you don't have a remote at hand. A remote is simply a short alias for the remote repository's URL. To fix this create a remote and a push and fetch configuration from the repositories view. In order to populate remote tracking branches in your local repo you need to run fetch once. As soon as this is done you can use "Push to upstream" instead of the more complex Team > Push... dialog which allows to define all parameters on the fly. When using native git command line you'll find the same concepts implemented there:

with "$ git push [url] [refspec]" (e.g. "$ git push https://github/user/myrepo.git master:master") you pass all parameters explicitly, this is similar to Team > Push... in EGit

with "$ git push [remote]" (e.g. "$ git push origin") you push to the repository defined by the configuration parameters of the given remote (check .git/config to see these parameters or open repository configuration from egit preference in Eclipse), this is similar to Team > Push to upstream in EGit. Usually the refspec used in this way is implicitly configured when creating a local branch based on a remote tracking branch. It's also possible to add this configuration later but since this is more tedious manual configuration the other way is more handy.

If you clone a remote repository the repository you cloned from is stored as remote "origin" in your clone. This way you can skip configuring the remote manually. This is only needed if the repository is born when you create it from scratch.

Matthias Sohn
  • 41
  • 1
3

The "Branching" section of the Egit User Guide can help:

Branch creation dialog

There is no obligation to create a local branch which would be named like a remote tracking branch (see "Having a hard time understanding git-fetch" to have a good understanding of "remote tracing branches).

You can create as many local branches (i.e. branches that you won't necessary push anywhere) as you want/need.

But if you don"t see any remote branch, maybe you didn't fetch that GitHub repo in the first place: see Fetching.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • See also the "Fetch" section of http://unicase.blogspot.com/2011/01/egit-tutorial-for-beginners.html – VonC Jul 05 '11 at 04:14
  • So after initially creating my repository on GitHub and then pushing the code up, I should then clone the repository so it becomes a remote repository? – David Jul 05 '11 at 16:05
  • @David: no, a remote repo remains remote, cloned or not. Remote tracking branches comes in play when you are fetching branches from a remote repo (which you already have: you current project references as an upstream repo the GitHub - remote - repo). So I would try a fetch (from EGit or even from command line) and see if remote branches are there. I would also go to the command line (bash session from a msysgit installation, beside Eclipse) to see what `git branch --all` returns. – VonC Jul 05 '11 at 16:50
  • Thanks, I created a new workspace and cloned my GitHub repository and imported my projects, this for some reason made more sense to me. – David Jul 05 '11 at 20:52