How can I find out what changes are not merged from develop to master, for all subrepos, but only changes I've made? -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail
On 17 Feb 2016, at 17:02, Rene Rivera
wrote: How can I find out what changes are not merged from develop to master, for all subrepos, but only changes I've made?
I would think it is basically the commits reachable in history from develop branch head but not reachable from master branch head. If you need this only once it is probably not worth making a script, rather you could do something like:
git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> develop — > develop.log
git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> master — > master.log
<favorite diff tool> develop.log master.log
You can mix and repeat the pattern options as you need if you have or want multiple user id´s or want to search for other texts that will include commits. The key is the logs will potentially be long, but most commits will be the same in the two branches. You are only interested in those in develop that are not in master and the diff should point those out.
git submodule foreach git log —full-history —author=grafikrobot@gmail.com develop — > develop.log
git submodule foreach git log —full-history —author=grafikrobot@gmail.com master — > master.log
diff develop master | grep "^<"
< commit 2b8b43fe1de0b101459445f4885e1116bdfb9ebc
< Author: Rene Rivera
AMDG On 02/17/2016 01:17 PM, Bjørn Roald wrote:
On 17 Feb 2016, at 17:02, Rene Rivera
wrote: How can I find out what changes are not merged from develop to master, for all subrepos, but only changes I've made?
I would think it is basically the commits reachable in history from develop branch head but not reachable from master branch head. If you need this only once it is probably not worth making a script, rather you could do something like:
git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> develop — > develop.log git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> master — > master.log
<favorite diff tool> develop.log master.log
Git know how to do this already: git log --author="<pattern>" master..develop In Christ, Steven Watanabe
On Wed, Feb 17, 2016 at 2:30 PM, Steven Watanabe
AMDG
On 02/17/2016 01:17 PM, Bjørn Roald wrote:
On 17 Feb 2016, at 17:02, Rene Rivera
wrote: How can I find out what changes are not merged from develop to master,
all subrepos, but only changes I've made?
I would think it is basically the commits reachable in history from develop branch head but not reachable from master branch head. If you need
for this only once it is probably not worth making a script, rather you could do something like:
git submodule foreach git log —full-history —author=<pattern>
—committer=<pattern> —grep=<pattern> develop — > develop.log
git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> master — > master.log
<favorite diff tool> develop.log master.log
Git know how to do this already:
git log --author="<pattern>" master..develop
Tried this: === develop grafik$ git submodule foreach git log --pretty=oneline --author=" grafikrobot@gmail.com" --since="one year ago" "master..develop" -- Entering 'libs/accumulators' fatal: bad revision 'master..develop' Stopping at 'libs/accumulators'; script returned non-zero status. === ??? Ahh... It need to point to origin as my clones don't have all the branches.. === Coqui:develop grafik$ git submodule foreach git log --pretty=oneline --author="grafikrobot@gmail.com" --since="one year ago" "origin/master..origin/develop" -- Entering 'libs/accumulators' [...] Entering 'libs/geometry' f13b300eb4ac17dce0bb84cff3b9b461397158f3 Support avoiding running b2 in new release doc builds. 6929cab9a3b1caf3cd4856ded91518cdaa6574b6 Adjust building so that we can override build/install locations for CI building. Entering 'libs/gil' [...] === Thanks. I can now go pester authors to see if they are going to merge libs to master or not. -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail
participants (3)
-
Bjørn Roald
-
Rene Rivera
-
Steven Watanabe