From: Daniel Barkalow <barkalow@iabervon.org>
Date: Mon, 13 Oct 2008 17:08:50 GMT
Subject: Re: [PATCH v2] Fix fetch/pull when run without --update-head-ok
Message-ID: <alpine.LNX.1.00.0810131305200.19665@iabervon.org>
In-Reply-To: <alpine.DEB.1.00.0810131129110.22125@pacific.mpi-cbg.de.mpi-cbg.de>

On Mon, 13 Oct 2008, Johannes Schindelin wrote:

> 
> Some confusing tutorials suggested that it would be a good idea to fetch
> into the current branch with something like this:
> 
> 	git fetch origin master:master
> 
> (or even worse: the same command line with "pull" instead of "fetch").
> While it might make sense to store what you want to pull, it typically
> is plain wrong when the current branch is "master".
> 
> As noticed by Junio, this behavior should be triggered by _not_ passing
> the --update-head-ok option, but somewhere along the lines we lost that
> behavior.
> 
> NOTE: this patch does not completely resurrect the original behavior
> without --update-head-ok: the check for the current branch is now _only_
> performed in non-bare repositories.
> 
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Acked-by: Daniel Barkalow <barkalow@iabervon.org>