Blender 2.8 git config seems to have changed


#1

For the last couple of days, when I build 2.8 (Win 10, 64 bit, VS Studio 2017) using the same script I’ve been using for months, I get the following in the command window:
E:\blender-2.8-git>cd blender

E:\blender-2.8-git\blender>make update >> e:\blender28log.txt
remote: Enumerating objects: 37, done.
remote: Counting objects: 100% (37/37), done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 20 (delta 18), reused 0 (delta 0)
Unpacking objects: 100% (20/20), done.
From git://git.blender.org/blender
3f4e3f718fd…7c438e5366b master -> origin/master
Your configuration specifies to merge with the ref ‘refs/heads/blender2.8’
from the remote, but no such ref was fetched.
error: pathspec ‘blender2.8’ did not match any file(s) known to git
Previous HEAD position was d3349b4 Updated from svn trunk (rBTS4697).
Switched to branch ‘master’
Previous HEAD position was f89d1c95 Fix orientation issue in object animation
Switched to branch ‘blender2.8’
Previous HEAD position was 41d528d Updates for keymap changes.
Switched to branch ‘blender2.8’
error: pathspec ‘blender2.8’ did not match any file(s) known to git
Previous HEAD position was 30d4611 check_style_c: fix error in case statement check
Switched to branch ‘master’
Your configuration specifies to merge with the ref ‘refs/heads/blender2.8’
from the remote, but no such ref was fetched.
fatal: run_command returned non-zero status for release/scripts/addons
.

My .git config is as follows:
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote “origin”]
url = git://git.blender.org/blender.git
fetch = +refs/heads/:refs/remotes/origin/
[branch “blender2.8”]
remote = origin
merge = refs/heads/blender2.8
[submodule “release/datafiles/locale”]
active = true
url = git://git.blender.org/blender-translations.git
[submodule “release/scripts/addons”]
active = true
url = git://git.blender.org/blender-addons.git
[submodule “release/scripts/addons_contrib”]
active = true
url = git://git.blender.org/blender-addons-contrib.git
[submodule “source/tools”]
active = true
url = git://git.blender.org/blender-dev-tools.git

What has happened? What do I need to change?

Thanks in advance,
Frank


#2

Announcement on bf-comitters about this


#3

To spare you the click:

The git branches for the Blender and addons repositories have been renamed:

  • blender2.8 -> master
  • master -> blender2.7

So if you want to build 2.8, then you need to checkout the master branch.


#4

actually the announcement had more instructions to get the right addons as well.

git checkout master
git branch -D blender2.8   # delete so we don't accidentally use it
make update   # update addons to the right version

#5

Thanks. That did it.