Re: Merging tags does not fast-forward with git 1.7.9

Domenico Andreoli <cavokz@gmail.com> writes:

Making "merge $tag" always record the signed tag information was the whole point of the change in 1.7.9, so asking to merge a tag will *not* fast forward by default anymore. "git merge v3.X-rcY^0" is a usable workaround in the meantime; we are also cooking a fix for a typical case where you ask for "git merge --ff-only v3.X-rcY" explicitly. This errored out incorrectly, which was discovered and fixed early this week and is cooking in the 'next' branch. We would like to push it out as part of 1.7.9.1, and we would need help testing it. The more people test it sooner, the likelier people will see more solid 1.7.9.1 release sooner.

Yes, that "diverging from mainline" is really bad, and that is why we need the fix to honor "--ff-only" (which is the way to make sure you do not diverge) tested quicly so that we can push 1.7.9.1 out.

Thanks.