Re: [PATCH v2] Fix fetch/pull when run without --update-head-ok
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 19 quoted lines
>
> 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: Shawn O. Pearce <spearce@spearce.org>
> Strangely, some more tests refused to pass this time, because they
> did not use --update-head-ok; this was fixed, too.
Not strange, --update-head-ok was busted and the tests took advantage
of it. :-\
--
Shawn.
Shawn O. Pearce <spearce@spearce.org>