git pull w/o checkout?

git pull w/o checkout?

[Kumar Gala]

I trying to see if there is a way to get the effect of a git-pull w/o  
getting the checked out files.

Any ideas?

thanks

- kumar

Re: git pull w/o checkout?

[Jeff King]

On Thu, Jun 22, 2006 at 07:51:56AM -0500, Kumar Gala wrote:

> I trying to see if there is a way to get the effect of a git-pull w/o  
> getting the checked out files.

git-fetch?

-Peff

Re: git pull w/o checkout?

[Kumar Gala]

On Jun 22, 2006, at 8:05 AM, Jeff King wrote:

> On Thu, Jun 22, 2006 at 07:51:56AM -0500, Kumar Gala wrote:
>
>> I trying to see if there is a way to get the effect of a git-pull w/o
>> getting the checked out files.
>
> git-fetch?

Its the first half, still need to resolve FETCH_HEAD, HEAD, etc..

- k

Re: git pull w/o checkout?

[Matthias Kestenholz]

* Kumar Gala (galak@kernel.crashing.org) wrote:
> I trying to see if there is a way to get the effect of a git-pull w/o  
> getting the checked out files.
> 
> Any ideas?

Do you want to fetch remote changes without merging them into your
working tree? If you, "git fetch" is your friend.

By the way, pull does the equivalent of a fetch and a subsequent
merge.

	Matthias

Re: git pull w/o checkout?

[Jeff King]

On Thu, Jun 22, 2006 at 08:10:10AM -0500, Kumar Gala wrote:

> >git-fetch?
> Its the first half, still need to resolve FETCH_HEAD, HEAD, etc..

Can you elaborate on what you're trying to accomplish?

-Peff

Re: git pull w/o checkout?

[Kumar Gala]

On Jun 22, 2006, at 8:11 AM, Matthias Kestenholz wrote:

> * Kumar Gala (galak@kernel.crashing.org) wrote:
>> I trying to see if there is a way to get the effect of a git-pull w/o
>> getting the checked out files.
>>
>> Any ideas?
>
> Do you want to fetch remote changes without merging them into your
> working tree? If you, "git fetch" is your friend.

that's what I want, however fetch isn't updating any refs/ as far as  
I can tell.

> By the way, pull does the equivalent of a fetch and a subsequent
> merge.

right, its the merge that seems to be doing the checkout.

- k

Re: git pull w/o checkout?

[Kumar Gala]

On Jun 22, 2006, at 8:13 AM, Jeff King wrote:

> On Thu, Jun 22, 2006 at 08:10:10AM -0500, Kumar Gala wrote:
>
>>> git-fetch?
>> Its the first half, still need to resolve FETCH_HEAD, HEAD, etc..
>
> Can you elaborate on what you're trying to accomplish?

A local mirror of a git tree.  I can do the clone easy enough, its  
trying to figure out the updates after the fact that is the issue.

- k

Re: git pull w/o checkout?

[Jeff King]

On Thu, Jun 22, 2006 at 08:13:54AM -0500, Kumar Gala wrote:

> that's what I want, however fetch isn't updating any refs/ as far as  
> I can tell.

It won't update the ref for the branch you're on; it will update the
head for the remotes (try running git-show-branch before and after your
fetch, and you should see an update on 'origin' or whatever remote
you're fetching).

-Peff

Re: git pull w/o checkout?

[Kumar Gala]

On Jun 22, 2006, at 8:17 AM, Jeff King wrote:

> On Thu, Jun 22, 2006 at 08:13:54AM -0500, Kumar Gala wrote:
>
>> that's what I want, however fetch isn't updating any refs/ as far as
>> I can tell.
>
> It won't update the ref for the branch you're on; it will update the
> head for the remotes (try running git-show-branch before and after  
> your
> fetch, and you should see an update on 'origin' or whatever remote
> you're fetching).

Ahh, I see.  I can than just copy the 'origin' ref over 'master'.

thanks

- kumar

Re: git pull w/o checkout?

[Jeff King]

On Thu, Jun 22, 2006 at 08:20:51AM -0500, Kumar Gala wrote:

> Ahh, I see.  I can than just copy the 'origin' ref over 'master'.

You can, though I'm not sure you even need to. If you're simply wanting
to mirror a git branch without checking out, then you're already done.
The mirror is just in 'origin', not 'master'.

-Peff

Re: git pull w/o checkout?

[Jakub Narebski]

Kumar Gala wrote:

> 
> On Jun 22, 2006, at 8:13 AM, Jeff King wrote:
> 
>> On Thu, Jun 22, 2006 at 08:10:10AM -0500, Kumar Gala wrote:
>>
>>>> git-fetch?
>>> Its the first half, still need to resolve FETCH_HEAD, HEAD, etc..
>>
>> Can you elaborate on what you're trying to accomplish?
> 
> A local mirror of a git tree.  I can do the clone easy enough, its  
> trying to figure out the updates after the fact that is the issue.

Assuming typical configuration, with the following in remotes/origin

---[ <path-to-repo>/.git/remotes/origin ]----
URL: git://git.kernel.org/pub/scm/git/git.git
Pull: refs/heads/master:refs/heads/origin
Pull:+refs/heads/pu:refs/heads/pu
Pull: refs/heads/man:refs/heads/man
Pull: refs/heads/html:refs/heads/html
Pull: refs/heads/next:refs/heads/next
Pull: refs/heads/todo:refs/heads/todo
Pull: refs/heads/maint:refs/heads/maint
---------------------------------------------

to update your repository, do:

$ git checkout master
$ git fetch origin

Any branch except listed ot fhose fetched to will do, or even any command
that leaves HEAD different than one of the branches fetched to. Everything
is updated. Then you can do the second part of pull, using

$ git checkout master
$ git pull . master

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

Re: git pull w/o checkout?

[Mathieu Chouquet-Stringer]

galak@kernel.crashing.org (Kumar Gala) writes:
> Ahh, I see.  I can than just copy the 'origin' ref over 'master'.

Or use git fetch -u ? 

-- 
Mathieu Chouquet-Stringer                     mchouque@free.fr