Re: [Rails-devel] Rails2.0: (Almost) all of Rails 1.x merged

[brett l. <bre...@gm...>]

On Sat, Oct 6, 2012 at 11:33 AM, Erik Vos <eri...@xs...> wrote:
> Brett,
>
>> "git fetch" is all you need. It will fetch all changesets across all
> remote
>> branches.
>
> I think you have overlooked this remark of mine:
>>> Please note, that I have configured the bare
>> > 'git push'/'git pull' to transmit branch 'master' only.+
> ...which also applies to git fetch.
>
>> Once you do a fetch or pull without arguments, it should pull down
>> references to any branches you're missing.
>
> No, and that is not what I had always intended either, see above. I don't
> want branches that I'm not interested in.  I want to keep it simple.  I
> guess that's unusual...
>

It is unusual and also a bit unnecessary. Git is extremely efficient
at what it does, so this sort of thing, as you're finding out, will
cause more problems than it solves.


>> If this fails, can you show what "git config --list" and "git branch -r"
> shows?
>
> git config -l:
>
> core.symlinks=false
> core.autocrlf=true
> color.diff=auto
> color.status=auto
> color.branch=auto
> color.interactive=true
> pack.packsizelimit=2g
> help.format=html
> http.sslcainfo=/bin/curl-ca-bundle.crt
> sendemail.smtpserver=/bin/msmtp.exe
> diff.astextplain.textconv=astextplain
> rebase.autosquash=true
> user.name=Erik Vos
> user.email=eri...@xs...
> branch.autosetuprebase=always
> core.repositoryformatversion=0
> core.filemode=false
> core.logallrefupdates=true
> core.autocrlf=false
> remote.origin.url=ssh://ev...@ra.../gitroot/rails/rails
> remote.origin.fetch=refs/heads/master:refs/remotes/origin/master

I recommend changing this to:

remote.origin.fetch=refs/heads/*:refs/remotes/origin/*

> remote.origin.push=refs/heads/master:refs/heads/master

This line isn't needed. A better way (imo) would be to set an alias.

But it's also functionally equivalent to "git push origin master"

> branch.master.remote=origin
> branch.master.merge=refs/heads/master
> branch.autosetuprebase=always
>
> git branch -r:
>
>   origin/master
>
> Thinking again, I might remove remote.origin.fetch, leaving
> remote.origin.push in place.
> Or can I add just a second branch?
>

You could, but I don't believe it's necessary. The whole '.git'
directory for rails is 32M, which includes all remote branches.
There's really not much (if any) savings in restricting your fetches
to just master. Remote branches don't really impact your local
repository if you don't check them out or track them in a local
branch.

> Erik.
>
>

---Brett.