Re: Stupid git question...
On Fri, Dec 11, 2015 at 5:27 PM, Valdis Kletnieks wrote: > OK.. Here's the situation - I've got several sets of patches I'll probably > be cooking over the holidays, and I'm planning to base on linux-next (though > any other moving-target base has the same issues). > > What I *want* to accomplish: > > At any given point, linux-next may or may not have breakages that cause > me grief (anything from compile issues to can't-boot-to-multiuser crashes). > What's the *clean* way to accomplish the following: > > > > git branch --track linux-next/master local-fixes > > git branch --track local-fixes project-1 > git branch --track local-fixes project-2 > git branch --track local-fixes project-3 > > Basically, have some way to keep track of the small integer number of > local things that I don't want escaping if I do a 'git format-patch project-2' > or other similar thing, and so I only have to deal with doing the local > fix once. Just dropping commits on top of linux-next doesn't seem right, as > it could get ugly the next 'git remote update'. > > What are maintainers doing to deal with similar issues, where you need to > make sure that your test builds in fact contain unrelated commits needed for > the build to be testable? Look at stacked git (stgit), it can resolve a number of the issues you seem to be running into. It makes it easy to modify patches in a series and you can easily update your tree. -- Cheers, Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Stupid git question...
On Fri, Dec 11, 2015 at 5:27 PM, Valdis Kletniekswrote: > OK.. Here's the situation - I've got several sets of patches I'll probably > be cooking over the holidays, and I'm planning to base on linux-next (though > any other moving-target base has the same issues). > > What I *want* to accomplish: > > At any given point, linux-next may or may not have breakages that cause > me grief (anything from compile issues to can't-boot-to-multiuser crashes). > What's the *clean* way to accomplish the following: > > > > git branch --track linux-next/master local-fixes > > git branch --track local-fixes project-1 > git branch --track local-fixes project-2 > git branch --track local-fixes project-3 > > Basically, have some way to keep track of the small integer number of > local things that I don't want escaping if I do a 'git format-patch project-2' > or other similar thing, and so I only have to deal with doing the local > fix once. Just dropping commits on top of linux-next doesn't seem right, as > it could get ugly the next 'git remote update'. > > What are maintainers doing to deal with similar issues, where you need to > make sure that your test builds in fact contain unrelated commits needed for > the build to be testable? Look at stacked git (stgit), it can resolve a number of the issues you seem to be running into. It makes it easy to modify patches in a series and you can easily update your tree. -- Cheers, Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Stupid git question...
OK.. Here's the situation - I've got several sets of patches I'll probably be cooking over the holidays, and I'm planning to base on linux-next (though any other moving-target base has the same issues). What I *want* to accomplish: At any given point, linux-next may or may not have breakages that cause me grief (anything from compile issues to can't-boot-to-multiuser crashes). What's the *clean* way to accomplish the following: git branch --track linux-next/master local-fixes git branch --track local-fixes project-1 git branch --track local-fixes project-2 git branch --track local-fixes project-3 Basically, have some way to keep track of the small integer number of local things that I don't want escaping if I do a 'git format-patch project-2' or other similar thing, and so I only have to deal with doing the local fix once. Just dropping commits on top of linux-next doesn't seem right, as it could get ugly the next 'git remote update'. What are maintainers doing to deal with similar issues, where you need to make sure that your test builds in fact contain unrelated commits needed for the build to be testable? pgp7I9zjxZX8T.pgp Description: PGP signature
Stupid git question...
OK.. Here's the situation - I've got several sets of patches I'll probably be cooking over the holidays, and I'm planning to base on linux-next (though any other moving-target base has the same issues). What I *want* to accomplish: At any given point, linux-next may or may not have breakages that cause me grief (anything from compile issues to can't-boot-to-multiuser crashes). What's the *clean* way to accomplish the following: git branch --track linux-next/master local-fixes git branch --track local-fixes project-1 git branch --track local-fixes project-2 git branch --track local-fixes project-3 Basically, have some way to keep track of the small integer number of local things that I don't want escaping if I do a 'git format-patch project-2' or other similar thing, and so I only have to deal with doing the local fix once. Just dropping commits on top of linux-next doesn't seem right, as it could get ugly the next 'git remote update'. What are maintainers doing to deal with similar issues, where you need to make sure that your test builds in fact contain unrelated commits needed for the build to be testable? pgp7I9zjxZX8T.pgp Description: PGP signature
Re: Stupid GIT question...
[EMAIL PROTECTED] writes: > What's the command to get a diff of "what I would merge if I said 'git pull'?" $ git fetch $ git diff master origin Andreas. -- Andreas Schwab, SuSE Labs, [EMAIL PROTECTED] SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Stupid GIT question...
I have a GIT tree (iwlwifi, but the problem is my idiocy, not the tree ;). What's the command to get a diff of "what I would merge if I said 'git pull'?" (similar to what 'cvs diff' does - AFAICT, 'git diff HEAD .' diffs my *current* pull of the tree against itself and does nothing... pgptApoYAiPqw.pgp Description: PGP signature
Stupid GIT question...
I have a GIT tree (iwlwifi, but the problem is my idiocy, not the tree ;). What's the command to get a diff of what I would merge if I said 'git pull'? (similar to what 'cvs diff' does - AFAICT, 'git diff HEAD .' diffs my *current* pull of the tree against itself and does nothing... pgptApoYAiPqw.pgp Description: PGP signature
Re: Stupid GIT question...
[EMAIL PROTECTED] writes: What's the command to get a diff of what I would merge if I said 'git pull'? $ git fetch $ git diff master origin Andreas. -- Andreas Schwab, SuSE Labs, [EMAIL PROTECTED] SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/