X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-update.sh;h=563a62d8fbb293b4140fdd17067caf552d215e9c;hb=a867758867a1283fafd9e4604f6f8bd0c381198d;hp=ec14bf68049d1dcffcf8b68b3d5ec36226c847af;hpb=ed26ca87473f2279f17ef3b262db87622dd9b9b9;p=topgit.git

diff --git a/tg-update.sh b/tg-update.sh
index ec14bf6..563a62d 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -22,7 +22,9 @@ base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
 ## First, take care of our base
 
 depcheck="$(mktemp)"
-needs_update "$name" >"$depcheck"
+missing_deps=
+needs_update "$name" >"$depcheck" || :
+[ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"
 if [ -s "$depcheck" ]; then
 	# We need to switch to the base branch
 	# ...but only if we aren't there yet (from failed previous merge)