From 7a92212f08c7465be9bd887d90375bb4779cabc6 Mon Sep 17 00:00:00 2001
From: bebbo <bebbo@bejy.net>
Date: Sun, 28 May 2017 16:22:50 +0200
Subject: [PATCH] @B fix update_sub: stop after merge if branch does not exist
 in submodule

---
 update_sub | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/update_sub b/update_sub
index daa5c39..e04d38f 100755
--- a/update_sub
+++ b/update_sub
@@ -90,7 +90,7 @@ else
 	# branch is now up to date
 	if [ "$4" != "" ]; then
 		# merge specified branch into "master / what's defined in .gitmodules"
-		git merge "$4"
+		git merge "$4" || exit 0
 		git push
 		# add the changes to the master module
 		pushd "$2"
@@ -98,4 +98,3 @@ else
 		popd		
 	fi
 fi
-