Hi Al... There's something I'll be thinking about all weekend (while my friend Stanley the grader helps me distribute 40 tons of gravel)... Your orangefs-untested branch has 5625087 commits. My "current" branch has 5625087 commits. In each all of the commit signatures match, except for the most recent 15 commits. The last 15 commits in my "current" branch were made from your orangefs-untested branch with "git format-patch" and applied to my "current" branch with "git am -s". "git log -p" shows that my most recent 15 commits differ from your most recent 15 commits by the addition of my "sign off" line. I will absolutely update my kernel.org for-next branch with the procedure you outlined, because you said so. I wish I understood it better, though... I can only guess at this point that the procedure you outlined will do some desirable thing to git metadata...? -Mike On Fri, Feb 19, 2016 at 5:22 PM, Al Viro <viro@xxxxxxxxxxxxxxxxxx> wrote: > On Fri, Feb 19, 2016 at 05:11:29PM -0500, Mike Marshall wrote: > >> I plan to update the kernel.org orangefs for-next tree to look exactly >> like the "current" branch of my github tree, unless someone says >> not to: >> >> github.com/hubcapsc/linux/tree/current Latest commit c1223ca > > $ git checkout current > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git orangefs-untested > $ git diff FETCH_HEAD # should report no differences > $ git reset --hard FETCH_HEAD > $ git push --force > > then push the same branch into your kernel.org (as for-next, again with -force). -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
