Re: What's in git.git (stable)

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

On Fri, 22 Dec 2006, Randal L. Schwartz wrote:

> >>>>> "Randal" == Randal L Schwartz <merlyn@stonehenge.com> writes:
> 
> >>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes:
> Junio> git-pull: refuse default merge without branch.*.merge
> 
> Randal> Argh.  How do I get back the old behavior?
> Randal> "git-pull origin" doesn't seem to be enough.

Maybe "git-pull origin master"?

> Randal> You just broke a bunch of automated scripts for me.
> 
> Ahh, it's "git-pull . origin".

This is just a merge, not a real pull (it leaves out the fetch part).

> Maybe a bit more warning for non-upward-compatible changes though, 
> please.

It is unfortunate that this change broke your scripts. But I really think 
that the new behaviour is much saner: If you have different branches, you 
probably do not want to pull the _same_ remote branch into _all_ of them.

So, for each branch (e.g. "xyz") for which you have a preferred upstream 
(e.g. remote "linus" with branch "master"), say

	$ git repo-config branch.xyz.remote linus
	$ git repo-config branch.xyz.merge refs/heads/master

Then,

	$ git pull

pulls your preferred upstream. But when you pull from another remote, or 
into another branch, without specifying which remote branch you want to 
pull, git now refuses to blindly pull branch "master". This should prevent 
quite some pilot errors.

Ciao,
Dscho