[Bf-blender-cvs] [86d8dc12c1] blender2.8: Use Git submodule tracking feature

[Sergey Sharybin]

Commit: 86d8dc12c10421cc3782619e0528d83f934385ea
Author: Sergey Sharybin
Date:   Mon Feb 20 10:16:58 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB86d8dc12c10421cc3782619e0528d83f934385ea

Use Git submodule tracking feature

This way we can point submodules to different branches.

There are two side-effects to this:

- Git 1.8.2 becomes the minimal required version now
  to support this feature.

- Not sure how doing local changes in submodules followed
  by `make update` will behave. We don't use explicit rebase
  now.

  Perhaps this is not so bad, since it was already quite
  dangerous thing to do.

===================================================================

M	.gitmodules
M	GNUmakefile
M	make.bat

===================================================================

diff --git a/.gitmodules b/.gitmodules
index 0b8228e3f1..0287532063 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,20 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
+	branch = blender2.8
 	ignore = all
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
+	branch = master
 	ignore = all
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
 	url = ../blender-translations.git
+	branch = master
 	ignore = all
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
+	branch = master
 	ignore = all
diff --git a/GNUmakefile b/GNUmakefile
index 1fda1a25a9..8fa9571dca 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -402,7 +402,7 @@ update: .FORCE
 		svn update ../lib/* ; \
 	fi
 	git pull --rebase
-	git submodule foreach git pull --rebase origin master
+	git submodule update --remote
 
 
 # -----------------------------------------------------------------------------
diff --git a/make.bat b/make.bat
index dd82b1ca8a..7a088a802f 100644
--- a/make.bat
+++ b/make.bat
@@ -90,7 +90,7 @@ if NOT "%1" == "" (
 	) else if "%1" == "update" (
 		svn up ../lib/*
 		git pull --rebase
-		git submodule foreach git pull --rebase origin master
+		git submodule update --remote
 		goto EOF
 	) else if "%1" == "clean" (
 		set MUST_CLEAN=1