Merge pull request #401 from mithro/master

Update submodules (and improve updating script).
timvideos · Jan 26, 2018 · 262e450 · 262e450
2 parents bc7feb5 + 314f9e6
commit 262e450
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/third_party/flash_proxies b/third_party/flash_proxies
diff --git a/third_party/litedram b/third_party/litedram
diff --git a/third_party/litepcie b/third_party/litepcie
diff --git a/third_party/litesata b/third_party/litesata
diff --git a/third_party/litescope b/third_party/litescope
diff --git a/third_party/liteusb b/third_party/liteusb
diff --git a/third_party/litevideo b/third_party/litevideo
diff --git a/third_party/litex b/third_party/litex
diff --git a/third_party/merge-upstream.sh b/third_party/merge-upstream.sh
@@ -41,7 +41,7 @@ for TARGET in ${MODULES[@]}; do
 	popd > /dev/null
 done
 
-if [ $DIRTY -eq 0 ]; then
+if [ $DIRTY = 0 ]; then
 	echo "All targets clean, good to update."
 else
 	echo "Some target are dirty, can't update."
@@ -62,13 +62,20 @@ for TARGET in ${MODULES[@]}; do
 		BEFORE_VER=$(git describe --always --dirty)
 		git fetch origin | sed -e's/^/    /'
 		git checkout origin/$BRANCH | sed -e's/^/    /'
+		git submodule update --recursive --init
 		AFTER_VER=$(git describe --always --dirty)
+		if echo $AFTER_VER | grep -q "dirty"; then
+			echo "Updated version is dirty!?"
+			exit 1
+		fi
 		if [ x"$BEFORE_VER" = x"$AFTER_VER" ]; then
 			echo "$TARGET is unchanged"
 		else
 			echo "Move $TARGET from $BEFORE_VER to $AFTER_VER"
 			cat >> $COMMIT_MSG <<EOF
  * $TARGET changed from $BEFORE_VER to $AFTER_VER
+$(git log --graph --pretty=format:'%h - %s <%an>' --no-color --abbrev-commit $BEFORE_VER..$AFTER_VER | sed -e's/^/    /')
+
 EOF
 		fi
 		echo