Thanks, that helped!

Paul

On 12/20/18 11:24, Sergey Sharybin wrote:
Hi,

This is correct that not all submodules have 2.8 branch.

You can do: `git submodule update --remote` That will update all the
submodules to latest revision of the branch they are tracking. This will
keep submodules on a detached HEAD, which is finr Git state, but might be
confusing for some use.

Alternatively, you can do `make update` in the root of the source trees.
That updates blender checkout and all submodules.

Or can manually run the following submodules update commands from gnu
makefile:

   git submodule foreach "git checkout blender2.8 || git checkout master"
   git submodule foreach git pull --rebase origin


On Thu, Dec 20, 2018 at 10:27 AM Paul Melis <paul.me...@surfsara.nl> wrote:

Hi,

I'd like to build 2.8 here locally, as I can't use the daily builds
(glibc is too old on our cluster system and won't be updated soon).
I build 2.7 regularly, so that's not an issue for me, but I'm having
trouble doing a correct checkout from git of the various 2.8 stuff.
The instructions on https://wiki.blender.org/wiki/Tools/Git are not
fully portable to 2.8, so any help is appreciated.

As a first step I clone the repo (but only the 2.8 branch):

git clone --single-branch --branch blender2.8
git://git.blender.org/blender.git blender28-git

Next comes the first hurdle, the submodules:

# Works
git submodule update --init --recursive

# git submodule foreach --recursive git checkout blender2.8
git checkout blender2.8
Entering 'release/datafiles/locale'
error: pathspec 'blender2.8' did not match any file(s) known to git.
Stopping at 'release/datafiles/locale'; script returned non-zero status.

So looking at .gitmodules it seems not all submodules use a branch2.8
branch. Should I replace the foreach with a manual set of checkouts of
the submodules with the correct branches? And I guess with the submodule
pull commands that would need the same? And finally, for keeping things
up-to-date over time, it would need another per-submodule command?

Thanks,
Paul

--

Paul Melis
| Visualization group leader & developer | SURFsara |
| Science Park 140 | 1098 XG Amsterdam |
| T 020 800 1312 | paul.me...@surfsara.nl | www.surfsara.nl |
_______________________________________________
Bf-committers mailing list
Bf-committers@blender.org
https://lists.blender.org/mailman/listinfo/bf-committers





--

Paul Melis
| Visualization group leader & developer | SURFsara |
| Science Park 140 | 1098 XG Amsterdam |
| T 020 800 1312 | paul.me...@surfsara.nl | www.surfsara.nl |
_______________________________________________
Bf-committers mailing list
Bf-committers@blender.org
https://lists.blender.org/mailman/listinfo/bf-committers

Reply via email to