[git-users] Small mystery

2010-04-07 Thread Pito Salas
I thought I understood this but here's a puzzle for me:

1) Download jquery branch locally:
$ git fetch origin jquery
From github.com:trustthevote/ElectionManager
 * branchjquery - FETCH_HEAD
Looks like it worked, right?

2) List all branches. Where is it?
$ git branch -a
  converterimport
  develop
  domain_tables
  jurist_list
  master
  txballot
* web-theme
  remotes/origin/HEAD - origin/master
  remotes/origin/converterimport
  remotes/origin/cucumber
  remotes/origin/develop
  remotes/origin/domain_tables
  remotes/origin/idents
  remotes/origin/master
  remotes/origin/mimic_nh_ballots
  remotes/origin/railroad
  remotes/origin/refactorrender
  remotes/origin/release-001
  remotes/origin/singleballotimp
  remotes/origin/tgd_dev
  remotes/origin/txballot
  remotes/origin/web-theme
  remotes/origin/wicked_pdf
  remotes/origin/yaml_batch_import
  remotes/origin/ymlsupport

Anyone see what's messing me up? Probably something stupid...

Thanks!

Pito

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



Re: [git-users] Small mystery

2010-04-07 Thread Jacob Helwig
On Wed, Apr 7, 2010 at 11:54, Pito Salas r...@salas.com wrote:
 I thought I understood this but here's a puzzle for me:

 1) Download jquery branch locally:
 $ git fetch origin jquery
 From github.com:trustthevote/ElectionManager
  * branch            jquery     - FETCH_HEAD
 Looks like it worked, right?

 2) List all branches. Where is it?
 $ git branch -a
  converterimport
  develop
  domain_tables
  jurist_list
  master
  txballot
 * web-theme
  remotes/origin/HEAD - origin/master
  remotes/origin/converterimport
  remotes/origin/cucumber
  remotes/origin/develop
  remotes/origin/domain_tables
  remotes/origin/idents
  remotes/origin/master
  remotes/origin/mimic_nh_ballots
  remotes/origin/railroad
  remotes/origin/refactorrender
  remotes/origin/release-001
  remotes/origin/singleballotimp
  remotes/origin/tgd_dev
  remotes/origin/txballot
  remotes/origin/web-theme
  remotes/origin/wicked_pdf
  remotes/origin/yaml_batch_import
  remotes/origin/ymlsupport

 Anyone see what's messing me up? Probably something stupid...

 Thanks!

 Pito


The problem is that git fetch doesn't _create_ branches.

When you downloaded the branch with git fetch origin jquery, it
stored the ref locally as FETCH_HEAD (cat .git/FETCH_HEAD if you
want to see the details).  If you want to create a local branch based
off of the remote jquery branch, you can git fetch  git checkout -b
jquery origin/jquery.  The git fetch in this case is simply update
all of my references to the origin repo, and git checkout -b jquery
origin/jquery will create a local jquery branch based off of the
origin/jquery reference.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



Re: [git-users] Small mystery

2010-04-07 Thread Pito Salas

 The problem is that git fetch doesn't _create_ branches.

 When you downloaded the branch with git fetch origin jquery, it
 stored the ref locally as FETCH_HEAD (cat .git/FETCH_HEAD if you
 want to see the details).  If you want to create a local branch based
 off of the remote jquery branch, you can git fetch  git checkout -b
 jquery origin/jquery.  The git fetch in this case is simply update
 all of my references to the origin repo, and git checkout -b jquery
 origin/jquery will create a local jquery branch based off of the
 origin/jquery reference.

 --

Wow, thanks.

So to clarify: git fetch origin jquery does download the commits but
not the branch (labels?)

-- Pito

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



Re: [git-users] Small mystery

2010-04-07 Thread Petr Baudis
On Wed, Apr 07, 2010 at 12:36:22PM -0700, Jacob Helwig wrote:
 The problem is that git fetch doesn't _create_ branches.
 
 When you downloaded the branch with git fetch origin jquery, it
 stored the ref locally as FETCH_HEAD (cat .git/FETCH_HEAD if you
 want to see the details).  If you want to create a local branch based
 off of the remote jquery branch, you can git fetch  git checkout -b
 jquery origin/jquery.

This doesn't make sense. If the git checkout was to work, it would have
to create at least the remote branch remote/origin/jquery, but
apparently it does not do even that and only updates the FETCH_HEAD.


A key note in git-fetch(1) is:

 A parameter ref without a colon is equivalent to ref: when
 pulling/fetching, so it merges ref into the current branch without
 storing the remote branch anywhere locally.

So, just Don't Do That - just specify `git fetch` and it should
pick up any missing branches. Or spell it out as jquery:jquery.

(I think this default is fairly unhappy, perhaps git fetch should warn
you if you use jquery instead of jquery:. Please ask about it on
g...@vger if you care about it. :-)

-- 
Petr Pasky Baudis
http://pasky.or.cz/ | Ars longa, vita brevis. -- Hippocrates

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Re: Small mystery

2010-04-07 Thread Jeffrey
 A key note in git-fetch(1) is:

  A parameter ref without a colon is equivalent to ref: when
  pulling/fetching, so it merges ref into the current branch without
  storing the remote branch anywhere locally.

That bit of the documentation seems a little off to me.  There's no
way that git fetch actually performs a merge.  What it does is fetch
the objects and update FETCH_HEAD to point to the fetched ref.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.