Re: [PATCH 0/2] [GIT PULL] ktest: A couple of fixes

[Linus Torvalds]

On Tue, May 1, 2012 at 5:44 PM, Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
>
> Is git set up to not fast forward by default? (I need to give it another try)

Git will fast-forward by default if you do a pull and there is no
development of your own in your tree.

There are two exceptions:

 - you explicitly say that you don't want to fast-forward (--no-ff or
"[merge] ff=false" in the git config file)

 - if you pull a signed tag with a modern version of git.

That second case may be what you hit.

If you do a

  git pull linus v3.4-rc5

in order to just update to the state of my latest tag, then git will
assume you want to do a new commit (and thus a non-fast-forward) just
so that git can record the tag signature in the commit.

The sad part is that I don't think you can even override the second
case. IOW, I think even "git pull --ff linus v3.4-rc5" will still do a
non-fast-forward merge.

That's inconvenient, and an unintended consequence of the behavior I
wanted as a top-level maintainer. But I really do think it's wrong for
normal developers who might validly just want to update to some
particular tagged release.

Junio? Any ideas?

                           Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/