-mm tree and git
Hello Andrew, community,
I am not really aware how your -mm tree cooperates with git so I have questions.
Actually I am talking about the "git-ubi.patch" in your tree. You seems to periodically update the patch by fetching the stuff from the ubi-2.6.git GIT tree.
1. How do you produce the diff file from the ubi-2.6.git?
2. Do you mind if I re-base the ubi-2.6.git from time to time? Does it cause any troubles for you?
3, Are there some special things I should or should not do to make it easy for you to work with the git tree?
4. I see a "ubi-versus-add-include-linux-freezerh-and-move-definitions-from.patch" patch in your tree. It is related to the stuff which is available in Linus's tree. But my tree does not have it yet. Is is OK if I won't push it for now and do this later when I sync with mainline?
Thanks.
Signature · 2 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий)
Quoted 8 lines · On Fri, 08 Dec 2006 15:47:37 +0200 Artem Bityutskiy <[email protected]> wrote:
Hello Andrew, community,
I am not really aware how your -mm tree cooperates with git so I have questions.
Actually I am talking about the "git-ubi.patch" in your tree. You seems to periodically update the patch by fetching the stuff from the ubi-2.6.git GIT tree.
Yes. Once per day is typical.
Quoted 1 line
1. How do you produce the diff file from the ubi-2.6.git?
I pull Linus's tip-of-tree then I pull your tree then I run git magic to generate the linus->you diff. The git magic varies, but is usually
git reset --hard "$upstream"
git fetch "$tree" || exit 1
git merge --no-commit 'test merge' HEAD FETCH_HEAD > /dev/null
{
git_header "$tree"
git log --no-merges ORIG_HEAD..FETCH_HEAD
git diff --patch-with-stat ORIG_HEAD
} >$PULL/$tree.patchQuoted 2 lines
2. Do you mind if I re-base the ubi-2.6.git from time to time? Does it cause any troubles for you?
No problem at all. In fact, people do this so often that I now always do a `git-branch -D' before pulling each tree.
Quoted 2 lines
3, Are there some special things I should or should not do to make it easy for you to work with the git tree?
The things which cause me trouble are:
- git trees which are based on other people's git trees (eg, git-wireless is based on git-netdev-all).
I have other git-pulling scripts which usually manage to sort this out.
- git trees which have lots of merge rejects
I'll usually kludge these locally, but maintainers who resync with Linus frequently and fix these things up are appreciated.
Problems are rare and you're unlikely to hear from me - just do whatever you want to do and I'll cope ;)
Quoted 5 lines
4. I see a "ubi-versus-add-include-linux-freezerh-and-move-definitions-from.patch" patch in your tree. It is related to the stuff which is available in Linus's tree. But my tree does not have it yet. Is is OK if I won't push it for now and do this later when I sync with mainline?
This is a patch I added to -mm to make your tree compile correctly when combined with a different tree (in this case, -mm itself). I frequently have such patches and I will send them to the appropriate developer when it is time for that developer to merge it (ie: the thing which their tree conflicts with has been merged into mainline).
In this case, add-include-linux-freezerh-and-move-definitions-from.patch was merged yesterday, so I sent ubi-versus-add-include-linux-freezerh-and-move-definitions-from.patch to you, because you now need it.