Closed Lacrymology closed 11 years ago
+1 -----Original Message----- From: Tomas Neme notifications@github.com Date: Fri, 26 Apr 2013 11:59:26 To: inaes-tic/mbc-playoutmbc-playout@noreply.github.com Reply-To: inaes-tic/mbc-playout reply@reply.github.com Subject: [mbc-playout] Make this self-updatable (#1)
We need to make it easier to update this project to the submodules' latest master from the Makefile
Reply to this email directly or view it on GitHub: https://github.com/inaes-tic/mbc-playout/issues/1
add an update target and an %-update target: cd $@ git checkout ${MBC_DEFAULT_BRANCH} git pull --rebase
On 26 April 2013 20:34, Juan Martin Runge notifications@github.com wrote:
+1 -----Original Message----- From: Tomas Neme notifications@github.com Date: Fri, 26 Apr 2013 11:59:26 To: inaes-tic/mbc-playoutmbc-playout@noreply.github.com Reply-To: inaes-tic/mbc-playout reply@reply.github.com Subject: [mbc-playout] Make this self-updatable (#1)
We need to make it easier to update this project to the submodules' latest master from the Makefile
Reply to this email directly or view it on GitHub: https://github.com/inaes-tic/mbc-playout/issues/1
— Reply to this email directly or view it on GitHubhttps://github.com/inaes-tic/mbc-playout/issues/1#issuecomment-17105717 .
Niv Sardi
git submodule foreach git pull origin master
that is less elegant as it doesn't allow to update a sepecific module. you can do something like ${MODULES}-update (not the right syntax)
Niv Sardi
sorry, @xaiki but git pull --rebase
doesn't work because git submodules don't checkout any specific branch, so pull doesn't have anything to merge against, and rebase doesn't either.
It will only work if you have checked out some branch and are working under mbc-playout, and also told git what branch to rebase against on your current branch before.
It could be something along the lines of git fetch && git checkout origin/master
...
${MBC_DEFAULT_BRANCH}
...
There is a problem here, When I do recursive clone, then Make. This makes a checkout master for each project, We dont need this becasuse We cant use Tagged version.
Which is the best way to resolve it?
Branching from tag, changing MBC_DEFAULT_BRANCH to 0.0.1, commit, push, tagging again ( and leave master as now)
Anyways I think It is bad idea to change cloned version on Make all
Sorry, fixed in 7fc3a8403be61004135952cc7f657137d9b6f503
make update
will update submodules to match origin/master
. Use with care if you're developing inside mbc-playout
We need to make it easier to update this project to the submodules' latest master from the Makefile